Compare commits
1518 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 561c073489 | |||
| 8c6bf075fb | |||
| 217836099c | |||
| febe1d0132 | |||
| fab32124d8 | |||
| 9055eaf73c | |||
| d804074121 | |||
| 328f7adc06 | |||
| 843435ad3b | |||
| 0a6133a0c9 | |||
| 05313c123c | |||
| 712bc5e380 | |||
| 537ebec330 | |||
| fa46fe89e5 | |||
| a34dd4cc79 | |||
| 5c20387e1d | |||
| 3ea4b77827 | |||
| d2e82d7209 | |||
| 213eb35be1 | |||
| 7c9e601010 | |||
| bd2b35b2e6 | |||
| b19f21fdff | |||
| 4e632ff9f4 | |||
| 8e7d08e4c9 | |||
| 2f4cead6e1 | |||
| e65822ceb5 | |||
| 18aa123672 | |||
| 79024ddcac | |||
| 26e8ca0370 | |||
| 1b06aec692 | |||
| ff78941795 | |||
| 6af40d9cae | |||
| 7de0f88b9e | |||
| af264a8922 | |||
| bd2bd32d30 | |||
| 823af36971 | |||
| 582004c605 | |||
| 75e91dbc79 | |||
| f697e2413a | |||
| 15fe664418 | |||
| b0be426c62 | |||
| 116d7395c9 | |||
| ff36dadadc | |||
| 3660306c52 | |||
| 37044040c4 | |||
| 6b49cb29fe | |||
| e0d0f7b493 | |||
| 53910dcd62 | |||
| 8d9c450ed9 | |||
| 2f4bb9c1b8 | |||
| c45dab1c31 | |||
| 47326e6535 | |||
| b8fd2c992f | |||
| 4daaf6ffd0 | |||
| 7be59894e4 | |||
| 3f4a64e833 | |||
| f3b02436ee | |||
| a1447c38c3 | |||
| e424218b01 | |||
| 9df2a7853f | |||
| 92703f6bbd | |||
| d731187d62 | |||
| 2854f2f6ce | |||
| 5165a2cabb | |||
| b946e40608 | |||
| 25c38f5bcb | |||
| e4d56be0af | |||
| ce59a00d02 | |||
| 31682e57da | |||
| 195f975c6a | |||
| 0476b78d09 | |||
| 74083fac93 | |||
| 966209f573 | |||
| 6ab59ec1e5 | |||
| 3210225c1b | |||
| 102dffcc65 | |||
| 44c19a2c5f | |||
| 47a952c204 | |||
| 2fce840ed9 | |||
| d8bc1379be | |||
| 15605f2a00 | |||
| 0526a81e8e | |||
| e30e980833 | |||
| fcf3bc8400 | |||
| 9d513edab4 | |||
| 8580acdb0c | |||
| e2e9111860 | |||
| 38b8f37d30 | |||
| 13d42d9565 | |||
| 9537691756 | |||
| e328c4e6f1 | |||
| 1eb5185240 | |||
| 9e4594f8b4 | |||
| 20a16471a9 | |||
| 8c995d4c44 | |||
| 1cefa18895 | |||
| a94e40a6aa | |||
| 40694e5766 | |||
| 8461398ff8 | |||
| d20f256736 | |||
| 8d1e61ec8b | |||
| 7034a288d0 | |||
| b4718437fc | |||
| 844e19f11f | |||
| 4c1d8df918 | |||
| c24b7b26c1 | |||
| 43d3138740 | |||
| 926f8ae710 | |||
| 77f79ba891 | |||
| d9924accf7 | |||
| a937fd78f3 | |||
| a7ff46ca99 | |||
| 7c2d470551 | |||
| 8ca120716c | |||
| 5fdc6fcf4e | |||
| 0de18419a4 | |||
| 0b48f1ecef | |||
| e3169ff880 | |||
| f788162d26 | |||
| 6e8852e7e0 | |||
| c3dbfc717b | |||
| a28365ae03 | |||
| 60dd0cb403 | |||
| 2a55db5082 | |||
| 5cecdaed9e | |||
| 1f3f2632cd | |||
| d4f5207d39 | |||
| bd7aeeebe1 | |||
| 6e39fe1c7f | |||
| f09f819138 | |||
| 067c5e692b | |||
| e7012dd5f7 | |||
| 47782c1845 | |||
| 9b61bba0d3 | |||
| 763a5da061 | |||
| 417c778d8c | |||
| facd8c0856 | |||
| 351cde50a7 | |||
| 7f8a9e01c0 | |||
| 8dd5a31ad4 | |||
| c0e70bd07f | |||
| 7ae537516b | |||
| 3f79e67735 | |||
| 9c1adee62a | |||
| 46e97f586b | |||
| ec3c5e65e6 | |||
| d9728dc706 | |||
| 9b1a5a8772 | |||
| a8eef823ff | |||
| 9242bcf7e2 | |||
| 0209dbfc4c | |||
| 46f8377acb | |||
| f95e7c441b | |||
| 0f54b832e7 | |||
| b3cc5c71d9 | |||
| 79b052b221 | |||
| bb7839f74b | |||
| 2162a0b3fc | |||
| 5dab9100da | |||
| 0e6abf4f28 | |||
| 2f108ebdd3 | |||
| 7ca5637fe4 | |||
| 5e258917c4 | |||
| 3924b735df | |||
| ed77856a12 | |||
| 974a804d72 | |||
| 243dcf00a5 | |||
| e495131b7e | |||
| 8b02b0da12 | |||
| a75cb19ea7 | |||
| 8755630ab1 | |||
| 564ee415be | |||
| aad546ed72 | |||
| 75e4b539a9 | |||
| c4aa1a2990 | |||
| ef3084af91 | |||
| e66e4f898f | |||
| 523bf78d33 | |||
| 7fe91d59d7 | |||
| f621c3613f | |||
| 6886569864 | |||
| 7b706e7fc1 | |||
| 1ecef8e09f | |||
| 492648a592 | |||
| 0063498f43 | |||
| 4d7f527230 | |||
| 081a8fcb69 | |||
| 3e9d0237aa | |||
| 533007d72e | |||
| 035dd8351d | |||
| 9e67df84a1 | |||
| bfd843cfde | |||
| 8860f5687c | |||
| 628efdc4e1 | |||
| 42db8abf15 | |||
| 28304f99cf | |||
| f15fb309d1 | |||
| 9d43691710 | |||
| 5733be8968 | |||
| 379b35cfe0 | |||
| 35be37224f | |||
| af92a64383 | |||
| 9b74b25348 | |||
| 143185a286 | |||
| 80a5d40897 | |||
| d2ec5b15d4 | |||
| d9ede3aae3 | |||
| cf1a090792 | |||
| f74ae7a72c | |||
| fc02d0967f | |||
| 0901c3a7ca | |||
| 98ad3532df | |||
| 7dae6650c2 | |||
| fe4754921e | |||
| 5c6cb02f63 | |||
| b60d3fa96e | |||
| 6da2cd998d | |||
| 2941475270 | |||
| a0af9b831f | |||
| 9a2faa48b5 | |||
| 5e67402330 | |||
| 2666aaa808 | |||
| 36890d34c1 | |||
| 4f4b8ddc77 | |||
| 1e91bde9fc | |||
| a9769dd78c | |||
| 1cf7a61e74 | |||
| 7a01793bfd | |||
| f421c00593 | |||
| 3c1fdb92a2 | |||
| 24b2405429 | |||
| 36645d162a | |||
| 3cb955fcb7 | |||
| e8ea4c5815 | |||
| 0c7726a6e7 | |||
| f6312363b2 | |||
| 760a91b3a3 | |||
| 226cac656f | |||
| fa6fad0a57 | |||
| dd13704423 | |||
| 56ff3267cf | |||
| 80ce35aadb | |||
| 93a699989b | |||
| 8811f87281 | |||
| 34023c807f | |||
| 586a5b24d1 | |||
| cd9f7c5da5 | |||
| ce24ab98a8 | |||
| 41bdd059d1 | |||
| 4ddb34cf19 | |||
| 3633d9c292 | |||
| b9b7e30e41 | |||
| 1d7b17b2d2 | |||
| 9f6643247a | |||
| a82bb52cb2 | |||
| 91f433e41c | |||
| 2d77838a01 | |||
| 8c307dee5c | |||
| dd0854a6ef | |||
| 50987d15fb | |||
| 59798f47ce | |||
| 389fa5df04 | |||
| d7a66d69cb | |||
| 7e0f73d9d2 | |||
| 4c117d274a | |||
| d470352dcd | |||
| d91f224179 | |||
| 950c2ed87b | |||
| 9e2ed83a7a | |||
| 9e0cfefce9 | |||
| 1a8e28a3a5 | |||
| b475391189 | |||
| 20f52a0cfc | |||
| e3c1c6baef | |||
| dcb2ddd341 | |||
| b6a1879543 | |||
| 09d6b85bd4 | |||
| 52351c2ca7 | |||
| 9fe1506dd3 | |||
| 7837564f08 | |||
| 72168fe1de | |||
| 1dc0f5e31e | |||
| 8b1ecb4775 | |||
| 0167cc9142 | |||
| 59b49084f9 | |||
| eba119cb47 | |||
| 767bb155f6 | |||
| 74ead47e3f | |||
| cf060cc387 | |||
| c0552e87a8 | |||
| 8e53e21189 | |||
| 058fb40e57 | |||
| 9e4b044761 | |||
| 6b5db421ad | |||
| 359ffc4676 | |||
| 486add5955 | |||
| 5885d88aff | |||
| a4c9419180 | |||
| b9199f0e37 | |||
| 5e4555dcdf | |||
| bc37f08a11 | |||
| dbf5e4fee8 | |||
| 663f02d9b7 | |||
| 3eca7da2e9 | |||
| ac5ccc3a13 | |||
| c4f2392a5a | |||
| 8cc9abcaa4 | |||
| 82ec12ed36 | |||
| 8cf048fb4e | |||
| 875b0109f3 | |||
| 6d2d1603af | |||
| b0e960be84 | |||
| 7a4d5cbe2f | |||
| 69db4bed94 | |||
| a0eeac59f0 | |||
| 257ddbf775 | |||
| 707e7d8f31 | |||
| 0e4efcd209 | |||
| 37a73ee2fe | |||
| 3bbb952b49 | |||
| 5ef5a9fd12 | |||
| bf1973e425 | |||
| 1e969171a8 | |||
| 84bd09a01c | |||
| e5178e19fc | |||
| 732449f516 | |||
| 6a2bd0465c | |||
| 53bf6ba5b3 | |||
| a6d49bae99 | |||
| 1b48ee24fa | |||
| 683b326194 | |||
| ea6da9e282 | |||
| be960f9e3f | |||
| 840dbd0125 | |||
| 39e2832b93 | |||
| 4a7b41dde7 | |||
| 7e32367791 | |||
| 9fc55c2743 | |||
| 145399b6d2 | |||
| aac43ec24d | |||
| dc07d77e20 | |||
| 66cbbc4ee9 | |||
| 8e7cfe3150 | |||
| 7b8352f65d | |||
| c1460e25e9 | |||
| 55f42ed03c | |||
| ac48bc5a21 | |||
| 76d3d6f9e6 | |||
| 3c36c24ddb | |||
| c4df2bf0ce | |||
| 255f9556ee | |||
| 7762e8e5d6 | |||
| c54f491bdd | |||
| d6bc7e313a | |||
| d37618feb5 | |||
| 7812b04369 | |||
| 899fbb9ab9 | |||
| 4eff768b53 | |||
| dc1bac2237 | |||
| d08f8eaa7e | |||
| 98cbf96077 | |||
| 2b8a5313cd | |||
| 43fd04e289 | |||
| 6fbe53b8b9 | |||
| 844d22ddf3 | |||
| bf79ae7477 | |||
| 3ced78bcad | |||
| 3d61c0924b | |||
| b2dec4d903 | |||
| b2433a9775 | |||
| efd7fab27c | |||
| f612eb7cdd | |||
| 0a0255e24d | |||
| b664ad784e | |||
| 819e6e02f7 | |||
| d160f7e4f2 | |||
| bb4d10daa0 | |||
| 09204750c9 | |||
| 936feccec9 | |||
| f1320c971f | |||
| e47b2df5d2 | |||
| 7ad6468969 | |||
| c329437700 | |||
| d83353bc82 | |||
| 1122b57f4c | |||
| 0b5d00e4b8 | |||
| ccb807d8fc | |||
| 7f825f2a09 | |||
| d6d7b9ff61 | |||
| 2279ac009b | |||
| 8bb31472df | |||
| b4291bad33 | |||
| ec787f5d45 | |||
| 4fbc11438b | |||
| 421a9d769e | |||
| 98a11dfaf5 | |||
| fe6f0f0e7c | |||
| 3b3d611962 | |||
| 5da5639f48 | |||
| f8d5d1820c | |||
| 22ff20584c | |||
| 7728907b67 | |||
| 831ab1de20 | |||
| 1cdac18192 | |||
| db4f5d7d15 | |||
| 5cb4230156 | |||
| 6d575da0b7 | |||
| f86db5ff41 | |||
| 9966a8335c | |||
| 05b771badb | |||
| 45acc78dc9 | |||
| 4676f96889 | |||
| 5d23e63512 | |||
| ee5fe87802 | |||
| 6e9bad7247 | |||
| 76737c5f85 | |||
| bf57560b30 | |||
| 2d6cdb1a89 | |||
| 7014e5d685 | |||
| f7e0dc87fd | |||
| 3dcbfdac63 | |||
| d3c22d1b03 | |||
| f94a105443 | |||
| f7bb550189 | |||
| 0c6e2f5c99 | |||
| 45cb6b9f59 | |||
| 31e786b9fd | |||
| 1660919521 | |||
| 9c0dc1ef19 | |||
| fb12ccc028 | |||
| 80b87cad63 | |||
| bf2d937f48 | |||
| 566350bc28 | |||
| 246776f1a1 | |||
| b62596fe6f | |||
| 8373cbc790 | |||
| 0981d2a887 | |||
| 64ed5cffb2 | |||
| 8134102fbc | |||
| 4a287e9138 | |||
| 1d78a73def | |||
| 7b275a693b | |||
| 59f3642477 | |||
| 6e3a64049a | |||
| 7cf9b7c355 | |||
| 0a0c8b557d | |||
| 7a2ae4c2cd | |||
| 95ffa4356b | |||
| 6a839bb4a4 | |||
| c72f200cfc | |||
| 1881e6743a | |||
| 9eb40dcca1 | |||
| c2091623c7 | |||
| 0a2fd52dec | |||
| c4a521c81e | |||
| 4890692531 | |||
| 5f9dd15b82 | |||
| ce3b0df7fe | |||
| eedb0334f5 | |||
| 93c2f8ea0c | |||
| 7802babd0e | |||
| c1eb6d8aa3 | |||
| bf2dbfcc65 | |||
| 259dd14062 | |||
| f9565c09fb | |||
| e70d2b1915 | |||
| e8999cfb8f | |||
| 4f6edcae47 | |||
| 39e7a38001 | |||
| 3ea3193ba4 | |||
| e0cd9baf37 | |||
| 16df1b04b3 | |||
| cefaee00da | |||
| 0232114d18 | |||
| b70830265e | |||
| 398a09f3ec | |||
| eb521cae22 | |||
| f4e35dffbd | |||
| e9c45da195 | |||
| f0c30514ad | |||
| 778fc73c24 | |||
| 932e6477d3 | |||
| 0422946069 | |||
| f3e62c82dd | |||
| 32d370fbd3 | |||
| 808e2a0b15 | |||
| 9cef93a3e7 | |||
| ba0882d4b3 | |||
| 8a06e7bc83 | |||
| 58bfb72a9f | |||
| a4bb632c22 | |||
| 4c37be68fb | |||
| 50ddc7eecd | |||
| 503a69ed01 | |||
| c6cb0c487f | |||
| 25a6e195f0 | |||
| 90e4e18ce5 | |||
| b970eb06a9 | |||
| 5dc4582118 | |||
| fb77bedb4c | |||
| 3d0791c4cb | |||
| af535fd526 | |||
| 067363a1cb | |||
| acd014d01d | |||
| 80bb8214eb | |||
| dafbdc452f | |||
| 25413a22c0 | |||
| cf7e669397 | |||
| 459e499863 | |||
| 89dc659401 | |||
| 2fcbe4c158 | |||
| 8e36976860 | |||
| b4fd22c2e5 | |||
| 85a27def5d | |||
| a4b580f4bd | |||
| 6ff1da7c66 | |||
| 789dce59fe | |||
| 960d55ab18 | |||
| 2deb5238b2 | |||
| b18b770725 | |||
| f747844332 | |||
| 798645cb8d | |||
| d85ccdc683 | |||
| ce3f50910c | |||
| e6162fa099 | |||
| 1b2794c6bb | |||
| b1aec45832 | |||
| c1e0fff1b1 | |||
| 11d90e4194 | |||
| 9f4cae384a | |||
| d9ec5c22c5 | |||
| b0d92a13fa | |||
| 72e6f4a31a | |||
| 4cac30bc26 | |||
| 8b0f3db2bf | |||
| bc3851bfa2 | |||
| a88f9d888f | |||
| 63cc08f21d | |||
| a526e72817 | |||
| 9233f64868 | |||
| d8f97dce09 | |||
| 5dcb7c570b | |||
| f84935a7a1 | |||
| 7725573738 | |||
| d332431012 | |||
| 38ee9913b1 | |||
| 60588509c6 | |||
| 1769ba2b51 | |||
| c3c3423cd3 | |||
| 10de735c30 | |||
| bc68c1578d | |||
| 95e9e54921 | |||
| 92a9e17d0a | |||
| 6f889ec557 | |||
| dd7a2e9359 | |||
| f62380d008 | |||
| 2f45acb487 | |||
| 03d5aee48d | |||
| 3d37dc5771 | |||
| 4e42e8e03a | |||
| a9ac59cee4 | |||
| d1f3de4419 | |||
| 89f2906ffc | |||
| 87c9f15de4 | |||
| 430f243e18 | |||
| 2da9e293d9 | |||
| e20648591d | |||
| 83aec0d814 | |||
| 2b0f11cfbd | |||
| 3d9f02d7d7 | |||
| f912572404 | |||
| 7cc8959b21 | |||
| cba5a35a61 | |||
| 452e5500c5 | |||
| c17125afde | |||
| 9c2c1b4dc8 | |||
| a65ece8f2d | |||
| 814de375ff | |||
| d45dd62401 | |||
| f618891a47 | |||
| 7f67bc1a39 | |||
| 3acf4e3bcc | |||
| 593ea04ad9 | |||
| 1211ea8ac9 | |||
| 5a361c0bb3 | |||
| fc864a9b00 | |||
| 90b5681603 | |||
| 0829144478 | |||
| 4f841a09ad | |||
| cd0927c281 | |||
| 1a483b827d | |||
| da597729a0 | |||
| 73b7c28db2 | |||
| 1f4b48ac8c | |||
| 22668e8a8f | |||
| 4662e48d65 | |||
| 37dad87c2a | |||
| 658aeaed52 | |||
| 48e09805d9 | |||
| c06e995e45 | |||
| 8a7642f238 | |||
| bdb2886c36 | |||
| 41ef6bc4ae | |||
| b4a4246713 | |||
| acb6d78a0f | |||
| a84c68ca17 | |||
| 6890b57b44 | |||
| 6f244c453c | |||
| f73c62c3df | |||
| 237a770067 | |||
| 33ff2cb49d | |||
| af7998273d | |||
| 58bd716057 | |||
| 20e6e4b77e | |||
| bc383bd82a | |||
| baa248e5ad | |||
| 10f20ee29a | |||
| 0306fdc72b | |||
| 2d83e27d89 | |||
| 1ec3aa58d4 | |||
| 37e4db9dcd | |||
| a79c5e87d8 | |||
| 387a3a9a54 | |||
| 79f9adea19 | |||
| bac4b1c29a | |||
| e4f304bac6 | |||
| ef1e27c0c4 | |||
| 3ebfdaeded | |||
| 8c0e3deb02 | |||
| 9f36bfbbb5 | |||
| 790ea09c2e | |||
| 23e4998948 | |||
| 5b79a15a3f | |||
| c1bf40a38c | |||
| 6e9795f1c0 | |||
| 019af7b3d9 | |||
| f7cdb29a4e | |||
| 7b2a51c87f | |||
| f291017645 | |||
| 9b65b068fc | |||
| 5019dfca60 | |||
| cbb86cebd3 | |||
| ced2cd90a3 | |||
| ea66ab89c5 | |||
| 4acdd09ad3 | |||
| b130acdf25 | |||
| 42044beae2 | |||
| 63c4ce6ad8 | |||
| eb38ede510 | |||
| 961a6d2533 | |||
| a798c9ddaf | |||
| 4053db453f | |||
| 47353bdbf8 | |||
| 2754a4a634 | |||
| aedaf7e0ec | |||
| 961d707a6d | |||
| 8de959ba5c | |||
| 45aac2c576 | |||
| 5edbe0e41b | |||
| 6e638bf5ae | |||
| c6ad8a8f43 | |||
| 7157ba1c10 | |||
| d8d2651892 | |||
| e3b2627551 | |||
| 99a2aae3ed | |||
| d6ea2ee79a | |||
| 24e10a35b4 | |||
| b6727a64f5 | |||
| 3b61a228eb | |||
| e09933cae5 | |||
| f941e6f940 | |||
| 70038a082e | |||
| da54e538cf | |||
| 69880f958d | |||
| f9ef530fe0 | |||
| e107d909de | |||
| 05d37e218d | |||
| 0381c9a5ef | |||
| 5cc3ca11e6 | |||
| b657e01129 | |||
| cb3e30a56c | |||
| 61e2bcab96 | |||
| 9d2041848c | |||
| d37ed44106 | |||
| 236ebb6fb0 | |||
| 38e5327ca0 | |||
| 94ba39f025 | |||
| 71fc5a81d4 | |||
| 2747e11231 | |||
| 29079a578f | |||
| fffd86cb30 | |||
| 0ef3f8b84b | |||
| 167aa2d98a | |||
| 31d8269399 | |||
| 4d43230a0b | |||
| 70d3e50baf | |||
| da4613bf8c | |||
| de68e33118 | |||
| 878c241eec | |||
| 72aeca2f13 | |||
| 78673138c2 | |||
| fd314caa86 | |||
| fe32fcd95a | |||
| e83ae513a8 | |||
| cbd4a90d01 | |||
| af92264847 | |||
| bf94c59bef | |||
| b70133272f | |||
| 55f6abdd1b | |||
| 959d0f8f5a | |||
| 078101ccb4 | |||
| 4b2a9dbd3e | |||
| afc3e4039c | |||
| 389f3a4289 | |||
| beb7ebd509 | |||
| 3b44311f6a | |||
| f5508bc5c3 | |||
| 2cf23d1000 | |||
| f6864e7c2e | |||
| 5e76d56abe | |||
| 97852fc5bf | |||
| 000543148a | |||
| d627b4c766 | |||
| 0d4b9c9089 | |||
| 8e0407ae1b | |||
| e07b1d3ad2 | |||
| af6009eb82 | |||
| 44c98a29d9 | |||
| d344b49ff0 | |||
| 62fb0e38b3 | |||
| 4049a29407 | |||
| ef3dad095d | |||
| 18f60cda6d | |||
| 0d4e4046a6 | |||
| 28c4adff0d | |||
| cfb94906c5 | |||
| de16144059 | |||
| 20eb1c2b62 | |||
| 18b7449149 | |||
| 9cbcc5feac | |||
| 64d452e41e | |||
| 3269e991dc | |||
| c67fa2b2d2 | |||
| d3dd1427a6 | |||
| 1a659333d6 | |||
| 9482f06ee8 | |||
| 0a4a756a6c | |||
| e127246219 | |||
| 7ad945d84b | |||
| 14b9232d65 | |||
| b57eac8bb6 | |||
| 20185dcc59 | |||
| 605ffedbf6 | |||
| 0ad38a5bf4 | |||
| 74aea484f8 | |||
| 8a94f6ed2d | |||
| a95447e355 | |||
| 7e91f23ddb | |||
| e5c53e0c56 | |||
| ebe4fe51b1 | |||
| 69f9c789a5 | |||
| 4ef29573f5 | |||
| 7ca436fd80 | |||
| d429a9770f | |||
| bb1823bdf8 | |||
| af938f958c | |||
| 928e724f5d | |||
| a88a6db9d9 | |||
| d673a6f455 | |||
| 183845d94f | |||
| cc95d7f5b4 | |||
| 665c401eca | |||
| ba0700c9d2 | |||
| 62b2d33c15 | |||
| 6e5d9ed16f | |||
| d7f106acb2 | |||
| e723c9b8c1 | |||
| 21542a8492 | |||
| b5840ebed8 | |||
| 593fec01f9 | |||
| 221df16a99 | |||
| 6f1049c667 | |||
| c6e17f32b8 | |||
| 3f7c42f31e | |||
| 75aa41d365 | |||
| c6b838d389 | |||
| 231177614b | |||
| db0a44b126 | |||
| 1a55cbe5ee | |||
| 05f0e41cb1 | |||
| 2d5ad4234c | |||
| 02247f73cf | |||
| 258cbf105b | |||
| 306e83b6d6 | |||
| 4d26ad9d4d | |||
| 879ba50542 | |||
| c39831ca5e | |||
| 07ed5c7632 | |||
| 2c70f3e164 | |||
| a6e7cc6239 | |||
| db42ab3655 | |||
| 32b3789efc | |||
| 2f900e9d9c | |||
| 583df34487 | |||
| f4b5870f06 | |||
| f56a4928c6 | |||
| e8c88b20d4 | |||
| 6eb88851c4 | |||
| 417e40c87b | |||
| 8c1f2be1f1 | |||
| 8e2d7871f9 | |||
| 6fc9a883d7 | |||
| 087e6318f6 | |||
| 7d077b6576 | |||
| ed45a5c351 | |||
| 7390a01a12 | |||
| 26c6900c79 | |||
| 3d4c3017da | |||
| 4388c6e540 | |||
| 16cfc2bfd5 | |||
| 5cbc26981b | |||
| 36ed3d46ee | |||
| 0dde1e871c | |||
| d9b11f6f3f | |||
| cf53bfcada | |||
| 5fedb42c96 | |||
| a95810710e | |||
| 8a0fb121ae | |||
| 7ceb6ecab3 | |||
| 8acd0ec5be | |||
| 5e21087eca | |||
| 3f881e208a | |||
| c708c98867 | |||
| 0b5e3d966f | |||
| 7fdfbba0de | |||
| 084dc503d2 | |||
| 390677ff2a | |||
| 61f6e94c26 | |||
| e7dcefb069 | |||
| 32d872c0eb | |||
| fab446a312 | |||
| 2bd73d4601 | |||
| 681977ce83 | |||
| 35ce8e8066 | |||
| 62edd61246 | |||
| c5c95056c2 | |||
| 3618581955 | |||
| 4cc77d52e0 | |||
| 813ee7e591 | |||
| 851e2a8b35 | |||
| 8c44154ed5 | |||
| f722f99bb0 | |||
| 8c490c4555 | |||
| 7cfcdaf7f9 | |||
| 36ecac7d5e | |||
| 808ccb6d5c | |||
| 6e2e267c42 | |||
| 7238b73b14 | |||
| cebe4b13a2 | |||
| d4526ffdb5 | |||
| e3f22ad128 | |||
| c208878f6c | |||
| 7fd7710e9d | |||
| 79948d67d7 | |||
| f8e01399ca | |||
| e57f664f24 | |||
| be7d31b049 | |||
| aab394efce | |||
| f64d6cb76d | |||
| 6c73b51a88 | |||
| ce0f963b9d | |||
| 606a3cf253 | |||
| 3ce03226b7 | |||
| 86293e28ad | |||
| 1219888cad | |||
| 39728fa2fc | |||
| 699157d7c7 | |||
| 26a70244de | |||
| 0c854ff472 | |||
| 1c50b03a71 | |||
| 609d03ce9b | |||
| 4c0f591de9 | |||
| 69c010a9af | |||
| 86c5657d51 | |||
| c1e006c5d1 | |||
| 1d629e802b | |||
| 049ac1f991 | |||
| d467cd1f73 | |||
| 60f55b58af | |||
| e85a253e6e | |||
| c9f054adab | |||
| 8904f179b8 | |||
| 7a18068078 | |||
| d69303ef03 | |||
| c0fec71b5d | |||
| fb3795e38a | |||
| 69dbf46a70 | |||
| e95fc39300 | |||
| 6605028499 | |||
| 5d6a72c7cd | |||
| e9eaab2577 | |||
| 33c2221acb | |||
| a7d7dfe44e | |||
| 47be99a78b | |||
| e079f683f3 | |||
| 6380550300 | |||
| 28992a0310 | |||
| bce9892a16 | |||
| 0b643557ba | |||
| 8f39806669 | |||
| d1bd15569e | |||
| d9c5e8ccce | |||
| 713dc9f191 | |||
| d6a27be92e | |||
| 488947216e | |||
| 90804af90b | |||
| ab185a5173 | |||
| 7d00b5f850 | |||
| 3411cb15a4 | |||
| b3864d21e3 | |||
| 3ecea06832 | |||
| 456104ef3e | |||
| 4085feb8db | |||
| e43c7a5990 | |||
| b1508cdc1a | |||
| cb8f5fe531 | |||
| 08a33a3e7b | |||
| 63e6285c5e | |||
| 31431308ae | |||
| b7d5ad5d81 | |||
| 872c026dca | |||
| 8f8e1f1153 | |||
| 16c2767c09 | |||
| 4e5910b0be | |||
| a12d82a3e8 | |||
| 757555962b | |||
| c5f2bff11d | |||
| 4464c90ad4 | |||
| fe0b2496e7 | |||
| 5dc51b41f7 | |||
| 090f875806 | |||
| 293644ac72 | |||
| 3fad6d7428 | |||
| ce8a10b5b8 | |||
| 91d7c8598f | |||
| 0daa2de23b | |||
| 281050a55a | |||
| 5dd304157f | |||
| d07747368a | |||
| e2d1a3f63e | |||
| 5bbb674ac5 | |||
| 574bd7c57c | |||
| 29b6757e53 | |||
| 4fac41e084 | |||
| 77834c0268 | |||
| 1295c593ac | |||
| 51d8d563b8 | |||
| 3586a8438c | |||
| 6ca217d76e | |||
| a77d77fcfa | |||
| 7c20a7ee8c | |||
| 8a808856de | |||
| 6b90cd6769 | |||
| 90742a5815 | |||
| 3db816c41d | |||
| dc9ee5bff1 | |||
| 6e49457b88 | |||
| f6496fe162 | |||
| 6931f499b1 | |||
| 68dd1c3859 | |||
| 620572e250 | |||
| 9467a57c5f | |||
| 09c12b4cd4 | |||
| 88edbe763b | |||
| 57c41c7a60 | |||
| bd08659e8c | |||
| 50d65eebaa | |||
| f33a17c156 | |||
| 506bc83006 | |||
| 4711d122d9 | |||
| 30e7ad2c5a | |||
| 8f7ebec2c0 | |||
| f037786163 | |||
| d1f9dc03ab | |||
| 37424d3ed0 | |||
| 6f6c134890 | |||
| 66f154902b | |||
| a18d91fabb | |||
| c800484a5f | |||
| 5fc45f056a | |||
| 6765e70a76 | |||
| 1db1760be4 | |||
| b456894669 | |||
| cc941b265c | |||
| 1b475ddeee | |||
| 39df2e6e11 | |||
| eb009e35b3 | |||
| df32e85aab | |||
| 750745209f | |||
| 8621c5b5cb | |||
| 70f4f8ce8b | |||
| 9bb4e1e9a9 | |||
| c018d096ec | |||
| 6c109f3a45 | |||
| 3db6e458af | |||
| 14529e9ad7 | |||
| 60fcf7aa8d | |||
| 3be139fe0a | |||
| f430dddc82 | |||
| e1f84a7f4f | |||
| 344b2d94df | |||
| f63c290a58 | |||
| 1052fe8295 | |||
| 01d4cd6255 | |||
| bc21756af5 | |||
| 25aa82adaa | |||
| 90523ad0ab | |||
| ff6878dbd7 | |||
| ce9b41e8c1 | |||
| 4023c58c35 | |||
| 5d876b61d1 | |||
| dfde08a4ea | |||
| 674cf286b0 | |||
| d8ccf06912 | |||
| b3f2029fff | |||
| 538e347923 | |||
| 95c36a8f3d | |||
| 7d48f67f02 | |||
| b8b3a58b52 | |||
| 0aad875551 | |||
| 2d89f401dc | |||
| b32bafda51 | |||
| 256851a0ce | |||
| 43aae08d1e | |||
| 5bef1602cb | |||
| d2a77e9dd0 | |||
| 77653d02c2 | |||
| 8b46d7abc8 | |||
| 27f627aa67 | |||
| 5fe1e9ea8f | |||
| 5885e8a2cf | |||
| a668ed9cbd | |||
| f2a6521229 | |||
| 53ef92a1d4 | |||
| a40ed4496e | |||
| 4c57bc1efb | |||
| 24b8def4ee | |||
| fb012082f4 | |||
| 87ceb0a1bb | |||
| b1cefb4f3d | |||
| 352ba1949b | |||
| a8353a4769 | |||
| 08c03bf6b3 | |||
| 4401907b10 | |||
| 9eb3ef6645 | |||
| a9f2af1025 | |||
| 4d71642dde | |||
| d14aa1ad8e | |||
| 9718217201 | |||
| f9881673b1 | |||
| 499bdd7348 | |||
| 69e7f41940 | |||
| 4d0600d5ac | |||
| 357e505e87 | |||
| dc53265634 | |||
| bea9ca5cc0 | |||
| 4a41fdbc38 | |||
| 0327d8617a | |||
| bd8212fdba | |||
| d05d2e7ae8 | |||
| faee11aab2 | |||
| 62ba7f2aa7 | |||
| f65e914093 | |||
| ec24aa68c1 | |||
| 82e35f1b70 | |||
| 9bba40c80e | |||
| 800cbaaec4 | |||
| 605d2a16b7 | |||
| d61b015c87 | |||
| c56d25139d | |||
| 62fd1d0ab2 | |||
| c2d70d515f | |||
| a00ed182e0 | |||
| 380f386f91 | |||
| 3e65a0dc7b | |||
| 882c68ff27 | |||
| 76d8628b2a | |||
| a0da9dedab | |||
| ec35191b70 | |||
| d2c4b7a763 | |||
| d7612af6a4 | |||
| 695f6e9152 | |||
| 0870c45137 | |||
| ee2a3e6354 | |||
| 8d0870477b | |||
| a66c0fdadf | |||
| d1f694da1b | |||
| 9f8910d48e | |||
| f331967417 | |||
| 37e54bc587 | |||
| c5e433a642 | |||
| fc5ec8d92a | |||
| 2c5f9d9329 | |||
| 2346c67f3a | |||
| d48ba9deb0 | |||
| d4c48ee62f | |||
| f71517425d | |||
| a329bb4c5b | |||
| 0b1273c61f | |||
| be0f1076db | |||
| 5caad8c1d7 | |||
| e974be99c5 | |||
| f44c32d501 | |||
| 1b6d28f2eb | |||
| a2a63e283d | |||
| 6ca41ed720 | |||
| ffec555e85 | |||
| 880df2a180 | |||
| 9d6f692b4d | |||
| 5bd120c4fa | |||
| 7a9da8eedf | |||
| 27b88b3d62 | |||
| d3c95a9fe1 | |||
| e4fd85c9cb | |||
| b3b81de6a8 | |||
| 4ee2ef1eb9 | |||
| 645bc8d695 | |||
| b4275d84c8 | |||
| 18c58522a2 | |||
| 417aaa9d28 | |||
| 84d8ea5d97 | |||
| 1e1d29d187 | |||
| 15dc9b4334 | |||
| 042c57c18c | |||
| 72c3df8172 | |||
| d9fa23b17b | |||
| 76b84f24d3 | |||
| f92d2f7f27 | |||
| 5cea4857dd | |||
| 9fad86eb17 | |||
| 3623e0059f | |||
| 13682c04a6 | |||
| 90a3d685b4 | |||
| be16c2ec56 | |||
| 9613a7f2a1 | |||
| 40ae593144 | |||
| 3228b95ef7 | |||
| 9ed2faf476 | |||
| 35e9be2b76 | |||
| 60f983df9b | |||
| ea2f942f94 | |||
| d4708c4bc8 | |||
| 101ac61b14 | |||
| bc1364c129 | |||
| 6f46ba5232 | |||
| 6c3cf425f2 | |||
| cd1cdb13fc | |||
| 92771d3257 | |||
| d9064b6605 | |||
| eb2e10ff02 | |||
| bcac3259d0 | |||
| acc12b187f | |||
| 522b13ad83 | |||
| f8a3298e36 | |||
| a5774e2bb3 | |||
| b8e5197bc7 | |||
| 76708b49fb | |||
| 7d2dd68344 | |||
| 7ce1a7b54e | |||
| d8c8d8dbb9 | |||
| a559357005 | |||
| 4381525430 | |||
| f200f11774 | |||
| af78e7cbab | |||
| 541e5ed046 | |||
| 6806f7ffe5 | |||
| e6179601fb | |||
| 9007a4df85 | |||
| 7b5c7afd54 | |||
| 806b4918cb | |||
| ec87d291ad | |||
| dc8879d7c6 | |||
| b7bcf8e67a | |||
| e6a3e7ebe5 | |||
| 00273c48b1 | |||
| 6b0ad866b8 | |||
| 628725065e | |||
| 1a2823a8c7 | |||
| 708ff42f3a | |||
| 745262fd1d | |||
| b351d5f521 | |||
| 9819f88532 | |||
| 0d1e9f0773 | |||
| b982ed20e3 | |||
| 703dfec817 | |||
| 6bd01317b0 | |||
| 60d4a802f7 | |||
| b90603fda7 | |||
| a5d60cfc25 | |||
| 8fd2fd8099 | |||
| 81c3e5bd1f | |||
| 292c7f9f24 | |||
| 2859979ad8 | |||
| 6a7befe164 | |||
| 6c55a2e6d1 | |||
| 35fd09e0b6 | |||
| b6f6d32bf5 | |||
| a6411a4fc5 | |||
| d621f7e6fc | |||
| c5914dcef7 | |||
| 9060691e0b | |||
| f034ca71fc | |||
| 0f2d47f790 | |||
| c651c0a0ec | |||
| b779986f7c | |||
| 08cdfa6a25 | |||
| de496d824b | |||
| 57ac22d400 | |||
| e3c819a3c2 | |||
| a8116b3416 | |||
| 59fc6266a1 | |||
| 192dbfc88d | |||
| 4885041e8e | |||
| 5e1aad554d | |||
| 5855607ed4 | |||
| a7ea4f8182 | |||
| ce5ca385b2 | |||
| 57eced2266 | |||
| 687388df5d | |||
| af27e297d9 | |||
| b38dcb5953 | |||
| 5e7081d445 | |||
| c5b8a203e6 | |||
| 61a71403ac | |||
| a10e36a9d9 | |||
| cb58ccd53a | |||
| afc0272f52 | |||
| 3e1332f39b | |||
| 19276ce733 | |||
| 9a126b7597 | |||
| 89e84c26b0 | |||
| 886129e290 | |||
| f1f7213d9a | |||
| 442bac04ab | |||
| 8b2c223e7c | |||
| 26b07d6787 | |||
| 01a1c14bfa | |||
| 59ea476746 | |||
| 5553b66d86 | |||
| db61bbf471 | |||
| e47744e13f | |||
| c7a908f70e | |||
| 6026c029a8 | |||
| 2d4da0dab3 | |||
| 7fe9b5ae6b | |||
| abc2e69b76 | |||
| 3b1bd8f322 | |||
| f651b0d22f | |||
| e8a3fafb63 | |||
| f9b430fb30 | |||
| 63a26ffe2a | |||
| 6414eb1ecf | |||
| 6ce7fee3d9 | |||
| cb4085e28e | |||
| 9959d0392a | |||
| d899a321b5 | |||
| 8409980e60 | |||
| c3dc2ca57a | |||
| 94dbb30df6 | |||
| 24c00fe115 | |||
| 2b94bc3ca0 | |||
| 23eb72e546 | |||
| de6c170a1c | |||
| 97d2563b2c | |||
| a97943a3b7 | |||
| 9847b71863 | |||
| 7b988449c2 | |||
| c2aa34a217 | |||
| 0c6cf23164 | |||
| b346a0b50c | |||
| 35bb960c13 | |||
| 1edaec2be1 | |||
| 642b3960fb | |||
| ee8d613313 | |||
| 7f0823562a | |||
| c027c0bfed | |||
| aa3ae29d73 | |||
| 79df54e848 | |||
| a080c81676 | |||
| e4a30cf089 | |||
| ed371c6af5 | |||
| e770576dbb | |||
| 4d44b586df | |||
| cfed001b9c | |||
| 4dd5b8f2de | |||
| b72626becc | |||
| 9a58a49cba | |||
| 24067b9c7d | |||
| b0144e6790 | |||
| 1f21ab5419 | |||
| 52e753ba1c | |||
| 3c33de1ec4 | |||
| 65c041b711 | |||
| 9d76ab8ecd | |||
| 0f34e3c886 | |||
| c4c2323bb7 | |||
| 3d6cfcb5b8 | |||
| 9e4f48afe4 | |||
| f370884f7d | |||
| 88da7b0d0b | |||
| 3d9801180e | |||
| 92f4a197c5 | |||
| 357035c231 | |||
| 9ceca832d0 | |||
| 8220942ded | |||
| f564035931 | |||
| 6751d4f843 | |||
| 0551413dc0 | |||
| 3aba4c977a | |||
| 349405038b | |||
| 2cd0503203 | |||
| b50576a70d | |||
| 10bfc71127 | |||
| 3ffd915a3f | |||
| 92f7c936dd | |||
| 2fc33559b2 | |||
| 52efe52221 | |||
| 5aef841bf4 | |||
| 1de20e8526 | |||
| d3d0591a48 | |||
| bd61e76529 | |||
| 9f06775afb | |||
| 0987a4f187 | |||
| 57e8ea08ba | |||
| 912748e132 | |||
| 02c91a2508 | |||
| 10987dcf37 | |||
| ca46bb9f04 | |||
| a6656f1ba0 | |||
| 5efc5167c4 | |||
| 8be883256e | |||
| 5240ffe2f6 | |||
| 578beef23b | |||
| da5a674040 | |||
| b9393e8ea1 | |||
| 05176244b3 | |||
| 070206562a | |||
| 566e429b8d | |||
| 47b59a4de1 | |||
| 6c2e92d785 | |||
| e3c3b66883 | |||
| 00da5cd5e9 | |||
| 30a6687da2 | |||
| 1bdbadf61e | |||
| 491498cb63 | |||
| 01f8b20ad7 | |||
| d1b5e7f749 | |||
| 73b7c7aab7 | |||
| 716469f3bf | |||
| b1d7088a46 | |||
| 190b5ee122 | |||
| 8ff4432400 | |||
| adc6cd215d | |||
| 8fbe10bc38 | |||
| 3ffec814fd | |||
| 5f22a8a713 | |||
| 63d270f270 | |||
| b32542896b | |||
| 1a30fb0af6 | |||
| ddeba3f786 | |||
| a25f06afeb | |||
| 44be6ad694 | |||
| 22d7f55aaa | |||
| 9171a29faf | |||
| 592ca82487 | |||
| 3d4998d783 | |||
| 23d30a6026 | |||
| 805bb1782f | |||
| eb532976f1 | |||
| 66b25571cf | |||
| 374dd0c318 | |||
| 12c0943814 | |||
| d214f14226 | |||
| 9a786c014a | |||
| 62149c500b | |||
| aeedbedbc5 | |||
| e4ef7dc9b8 | |||
| 8795f9bb3e | |||
| dd8bbfe7b1 | |||
| b8d75a90bd | |||
| 1f21a6d6bb | |||
| 294c4373e0 | |||
| ccb5af08fa | |||
| 4506bcdcb8 | |||
| 42d41b69b3 | |||
| 3a9469ebc5 | |||
| f0201bcb25 | |||
| 1303886512 | |||
| 5924634763 | |||
| 77b32b72fc | |||
| d43a537f19 | |||
| 68516ffd3d | |||
| 331eb59c73 | |||
| 2b02a91627 | |||
| 2de877f09a | |||
| 3aeed52ceb | |||
| 0a88c693c7 | |||
| b83dda2db2 | |||
| cf6ddb045f | |||
| f2783e3d37 | |||
| 0b60b7de38 | |||
| 348c887af7 | |||
| 97c64ce03c | |||
| aea37b1110 | |||
| 450552ee75 | |||
| ef4ac14e18 | |||
| 1d208d37a2 | |||
| 2afc9acf2c | |||
| e8052ed5a2 | |||
| d0b624f74b | |||
| 58b9ffcea8 | |||
| 340fc785f5 | |||
| a9ac48c016 | |||
| cde7309597 | |||
| 1708de0abb | |||
| f413f44e3d | |||
| e568c91dd7 | |||
| bc27286a54 | |||
| e0fa3e9bac | |||
| bd700b1e36 | |||
| a2566419c6 | |||
| db063fc394 | |||
| 1f0ff69c58 | |||
| 57240c0b1b | |||
| 0de4730518 | |||
| 70414dc00f | |||
| f3c3452a16 | |||
| d39acbe570 | |||
| 4454f5c64d | |||
| c375f61b94 | |||
| 99c0abb0fd | |||
| 0ffde6db57 | |||
| 3ac8a1ace7 | |||
| 390bc4c23c | |||
| ab429c1c67 | |||
| 553fa000b5 | |||
| cb3ad67aaa | |||
| d8d3078f2f | |||
| fc134abf0c | |||
| 8df24f8f1d | |||
| dddf55565b | |||
| 429abcd7cf | |||
| ad8a5718c2 | |||
| bab66a31e6 | |||
| f1d7b4fd32 | |||
| b41b024239 | |||
| 26bd0e284f | |||
| c0bd2de326 | |||
| 83f1ef8856 | |||
| 3ce5ff08d5 | |||
| b7609d22ba | |||
| 086f9a0721 | |||
| ca67fed604 | |||
| e390874ef6 | |||
| 68c66fec24 | |||
| ee17743d07 | |||
| 7df41a8403 | |||
| 186005656f | |||
| bb96cf0033 | |||
| 5a85a607b7 | |||
| d07cfdff7b | |||
| 603da66f00 | |||
| 6e3a74bd2c | |||
| 9d3a2761b8 | |||
| fc61f46802 | |||
| 9d74e8dcb0 | |||
| 0097b48ba5 | |||
| e61b54d9ae | |||
| c746f0ce2b | |||
| e3b2b5d32c | |||
| 11c2dd0412 | |||
| 5f95187c01 | |||
| 1bfe90de1c | |||
| 2a38aeea45 | |||
| 2dc6af1bc8 | |||
| 51c45ac2fc | |||
| 193108f573 | |||
| d3104d9598 | |||
| cf49953145 | |||
| 8d95f7ef5c | |||
| 297ad69831 | |||
| 4f8bb3892e | |||
| 04a34c9cae | |||
| caa5ca85c5 | |||
| 39cc5ec35f | |||
| 8fa562f247 | |||
| 3ced4656bd | |||
| 1d056d1960 | |||
| 169d9aedc9 | |||
| bd6548af2f | |||
| 40a5d6513d | |||
| 04cc2aa538 | |||
| 5a7c1c7d9c | |||
| 17bc27ef38 | |||
| 03f3241966 | |||
| cc01ffb89b | |||
| 7d76b7b5f7 | |||
| f84671fee8 | |||
| d93f5e168d | |||
| 424f3f3e9d | |||
| b68eadc2f7 | |||
| 98d3f13972 | |||
| 595ea40e6c | |||
| 3ce3808995 | |||
| a9011e014b | |||
| de1d30fdb6 | |||
| 1eb01b0532 | |||
| 20ae251943 |
+21
-1
@@ -7,7 +7,7 @@
|
|||||||
#--------------------------------
|
#--------------------------------
|
||||||
# area MP.Stats
|
# area MP.Stats
|
||||||
#--------------------------------
|
#--------------------------------
|
||||||
/Mp.FileData/temp/*.csv
|
/MP.FileData/temp/*.csv
|
||||||
*.bak
|
*.bak
|
||||||
|
|
||||||
#--------------------------------
|
#--------------------------------
|
||||||
@@ -16,6 +16,20 @@
|
|||||||
/VersGen/bin/*
|
/VersGen/bin/*
|
||||||
/VersGen/obj/*
|
/VersGen/obj/*
|
||||||
|
|
||||||
|
#--------------------------------
|
||||||
|
# Area MP-TAB3
|
||||||
|
#--------------------------------
|
||||||
|
/MP-TAB3/bin/*
|
||||||
|
/MP-TAB3/obj/*
|
||||||
|
|
||||||
|
#--------------------------------
|
||||||
|
# Area Generica
|
||||||
|
#--------------------------------
|
||||||
|
/*/*/bin/*
|
||||||
|
/*/*/obj/*
|
||||||
|
/*/bin/*
|
||||||
|
/*/obj/*
|
||||||
|
|
||||||
# ---> VisualStudio
|
# ---> VisualStudio
|
||||||
## Ignore Visual Studio temporary files, build results, and
|
## Ignore Visual Studio temporary files, build results, and
|
||||||
## files generated by popular Visual Studio add-ons.
|
## files generated by popular Visual Studio add-ons.
|
||||||
@@ -163,12 +177,18 @@ publish/
|
|||||||
|
|
||||||
# NuGet Packages
|
# NuGet Packages
|
||||||
*.nupkg
|
*.nupkg
|
||||||
|
# NuGet Symbol Packages
|
||||||
|
*.snupkg
|
||||||
# The packages folder can be ignored because of Package Restore
|
# The packages folder can be ignored because of Package Restore
|
||||||
|
**/[Pp]ackages/*
|
||||||
**/packages/*
|
**/packages/*
|
||||||
# except build/, which is used as an MSBuild target.
|
# except build/, which is used as an MSBuild target.
|
||||||
!**/packages/build/
|
!**/packages/build/
|
||||||
# Uncomment if necessary however generally it will be regenerated when needed
|
# Uncomment if necessary however generally it will be regenerated when needed
|
||||||
#!**/packages/repositories.config
|
#!**/packages/repositories.config
|
||||||
|
# NuGet v3's project.json files produces more ignorable files
|
||||||
|
*.nuget.props
|
||||||
|
*.nuget.targets
|
||||||
|
|
||||||
# Windows Azure Build Output
|
# Windows Azure Build Output
|
||||||
csx/
|
csx/
|
||||||
|
|||||||
+259
-49
@@ -1,8 +1,11 @@
|
|||||||
variables:
|
variables:
|
||||||
|
VERS_MAIN: '1.0'
|
||||||
NEXUS_PATH: 'MP-STATS'
|
NEXUS_PATH: 'MP-STATS'
|
||||||
PROJ_PATH: ''
|
PROJ_PATH: ''
|
||||||
APP_NAME: 'MP.Stats'
|
APP_NAME: 'MP.Stats'
|
||||||
SOL_NAME: 'MP-STATS'
|
SOL_NAME: 'MP-STATS'
|
||||||
|
NUGET_PATH: 'C:\Tools\nuget.exe'
|
||||||
|
DEST: 'install'
|
||||||
|
|
||||||
# nota: cer creazione rules: https://docs.gitlab.com/ee/ci/jobs/job_control.html#common-if-clauses-for-rules
|
# nota: cer creazione rules: https://docs.gitlab.com/ee/ci/jobs/job_control.html#common-if-clauses-for-rules
|
||||||
|
|
||||||
@@ -39,6 +42,20 @@ variables:
|
|||||||
echo "Situazione sorgenti FINALE:"
|
echo "Situazione sorgenti FINALE:"
|
||||||
dotnet nuget list source
|
dotnet nuget list source
|
||||||
|
|
||||||
|
|
||||||
|
# helper x fix appsettings config nei casi installer / office
|
||||||
|
.appsettings-fix: &appsettings-fix
|
||||||
|
- |
|
||||||
|
echo "esecuzione FIX appsettings.json"
|
||||||
|
$srcFile="$env:APP_NAME/appsettings.Production-install.json"
|
||||||
|
$dstFile="$env:APP_NAME/appsettings.Production.json"
|
||||||
|
if (($env:DEST -ne 'install')) {
|
||||||
|
$srcFile="$env:APP_NAME/appsettings.Production-office.json"
|
||||||
|
}
|
||||||
|
echo "Copy-Item -Path $srcFile -Destination $dstFile -force"
|
||||||
|
Copy-Item -Path $srcFile -Destination $dstFile -force
|
||||||
|
echo "Completata copia file appsettings.json corretto"
|
||||||
|
|
||||||
# helper creazione hash files x IIS
|
# helper creazione hash files x IIS
|
||||||
.hashBuild: &hashBuild
|
.hashBuild: &hashBuild
|
||||||
- |
|
- |
|
||||||
@@ -76,6 +93,42 @@ variables:
|
|||||||
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
|
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
|
||||||
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html
|
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html
|
||||||
|
|
||||||
|
# helper x fix version number
|
||||||
|
.version-fix: &version-fix
|
||||||
|
- |
|
||||||
|
$env:NEW_REL = $env:VERS_MAIN+"."+(get-date -format yyMM)+"."+(get-date -format ddHH)
|
||||||
|
$env:NUM_REL = $env:VERS_MAIN+"."+(get-date -format yyMM)+"."+(get-date -format dHH)
|
||||||
|
$env:NUM_DEB = $env:VERS_MAIN+"."+(get-date -format yyMM)+"-beta."+(get-date -format dHH)
|
||||||
|
# display versioni generate
|
||||||
|
$resoconto = "Effettuato fix file VersGen | release v: " + $env:NUM_REL + " | debug v: " + $env:NUM_DEB;
|
||||||
|
Write-Output $resoconto;
|
||||||
|
echo "Replace completati"
|
||||||
|
|
||||||
|
# helper x fix nuspec file
|
||||||
|
.nuspec-fix: &nuspec-fix
|
||||||
|
- |
|
||||||
|
echo "Modifica dati file nuspec Release"
|
||||||
|
$currRelease = $env:NUM_REL
|
||||||
|
$currDebug = $env:NUM_DEB
|
||||||
|
$find = "<version>(.|\n)*?</version>";
|
||||||
|
$fileNameRel = "*.Release.nuspec";
|
||||||
|
$replRel = "<version>" + $currRelease + "</version>";
|
||||||
|
$replCopy ="Egalware 2021+";
|
||||||
|
$adesso = $env:VERS_MAIN+"."+(get-date -format yyMM)+"."+(get-date -format dHH)
|
||||||
|
$nuspDataRel = Get-Content $fileNameRel;
|
||||||
|
$nuspDataRelUpd = $nuspDataRel -replace $find, $replRel;
|
||||||
|
$nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#", $replCopy;
|
||||||
|
$nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#", "Build $adesso";
|
||||||
|
Set-Content -Path $fileNameRel -Value $nuspDataRelUpd;
|
||||||
|
echo "Modifica dati file nuspec Debug"
|
||||||
|
$fileNameDeb = "*.Debug.nuspec";
|
||||||
|
$replDeb = "<version>" + $currDebug + "</version>";
|
||||||
|
$nuspDataDeb = Get-Content $fileNameDeb;
|
||||||
|
$nuspDataDebUpd = $nuspDataDeb -replace $find, $replDeb;
|
||||||
|
$nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#", $replCopy;
|
||||||
|
$nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#", "Build $adesso";
|
||||||
|
Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd;
|
||||||
|
echo "replace completati"
|
||||||
|
|
||||||
# Stages previsti
|
# Stages previsti
|
||||||
stages:
|
stages:
|
||||||
@@ -84,7 +137,9 @@ stages:
|
|||||||
- installer
|
- installer
|
||||||
- release
|
- release
|
||||||
|
|
||||||
# ----- Start BUILD -----
|
# --------------------------------
|
||||||
|
# BUILD
|
||||||
|
# --------------------------------
|
||||||
LAND:build:
|
LAND:build:
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
@@ -145,7 +200,7 @@ MON:build:
|
|||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
variables:
|
variables:
|
||||||
APP_NAME: MP.Mon
|
APP_NAME: MP.MON
|
||||||
SOL_NAME: MP-MON
|
SOL_NAME: MP-MON
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == 'develop'
|
- if: $CI_COMMIT_BRANCH == 'develop'
|
||||||
@@ -230,6 +285,24 @@ IOC:build:
|
|||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
|
RIOC:build:
|
||||||
|
stage: build
|
||||||
|
tags:
|
||||||
|
- win
|
||||||
|
variables:
|
||||||
|
APP_NAME: MP.RIOC
|
||||||
|
SOL_NAME: MP-RIOC
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_BRANCH == 'develop'
|
||||||
|
- if: $CI_COMMIT_BRANCH == 'master'
|
||||||
|
- if: $CI_COMMIT_BRANCH =~ /^feature\/IOC.+/
|
||||||
|
when: always
|
||||||
|
before_script:
|
||||||
|
- *nuget-fix
|
||||||
|
- dotnet restore "$env:SOL_NAME.sln"
|
||||||
|
script:
|
||||||
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
TAB3:build:
|
TAB3:build:
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
@@ -249,7 +322,9 @@ TAB3:build:
|
|||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
|
|
||||||
# ----- Start DEPLOY develop (IIS01) -----
|
# --------------------------------
|
||||||
|
# DEPLOY develop (IIS01 + beta nuget)
|
||||||
|
# --------------------------------
|
||||||
LAND:IIS01:deploy:
|
LAND:IIS01:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
@@ -267,8 +342,32 @@ LAND:IIS01:deploy:
|
|||||||
needs: ["LAND:build"]
|
needs: ["LAND:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
|
LAND:SDK:deploy:
|
||||||
|
stage: deploy
|
||||||
|
tags:
|
||||||
|
- win
|
||||||
|
variables:
|
||||||
|
APP_NAME: MP.AppAuth
|
||||||
|
SOL_NAME: MP-LAND
|
||||||
|
before_script:
|
||||||
|
- *nuget-fix
|
||||||
|
- dotnet restore "$env:SOL_NAME.sln"
|
||||||
|
- *version-fix
|
||||||
|
- *nuspec-fix
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_BRANCH == 'develop'
|
||||||
|
- if: $CI_COMMIT_BRANCH =~ /^feature\/LAND.+/
|
||||||
|
when: always
|
||||||
|
needs: ["LAND:build"]
|
||||||
|
script:
|
||||||
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
- '& Remove-Item *.nupkg'
|
||||||
|
- '& $env:NUGET_PATH pack "EgwProxy.MP.Core.Debug.nuspec"'
|
||||||
|
- '& "$env:NUGET_PATH" setapikey $NUGET_API_KEY -source http://nexus.steamware.net/repository/nuget-hosted'
|
||||||
|
- '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
|
||||||
|
|
||||||
PROG:IIS01:deploy:
|
PROG:IIS01:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
@@ -286,7 +385,7 @@ PROG:IIS01:deploy:
|
|||||||
needs: ["PROG:build"]
|
needs: ["PROG:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
STAT:IIS01:deploy:
|
STAT:IIS01:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
@@ -305,14 +404,14 @@ STAT:IIS01:deploy:
|
|||||||
needs: ["STAT:build"]
|
needs: ["STAT:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
MON:IIS01:deploy:
|
MON:IIS01:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
variables:
|
variables:
|
||||||
APP_NAME: MP.Mon
|
APP_NAME: MP.MON
|
||||||
SOL_NAME: MP-MON
|
SOL_NAME: MP-MON
|
||||||
before_script:
|
before_script:
|
||||||
- *nuget-fix
|
- *nuget-fix
|
||||||
@@ -324,7 +423,7 @@ MON:IIS01:deploy:
|
|||||||
needs: ["MON:build"]
|
needs: ["MON:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
SPEC:IIS01:deploy:
|
SPEC:IIS01:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
@@ -343,7 +442,7 @@ SPEC:IIS01:deploy:
|
|||||||
needs: ["SPEC:build"]
|
needs: ["SPEC:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
INVE:IIS01:deploy:
|
INVE:IIS01:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
@@ -362,7 +461,7 @@ INVE:IIS01:deploy:
|
|||||||
needs: ["INVE:build"]
|
needs: ["INVE:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
CONF:IIS01:deploy:
|
CONF:IIS01:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
@@ -381,7 +480,7 @@ CONF:IIS01:deploy:
|
|||||||
needs: ["CONF:build"]
|
needs: ["CONF:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
IOC:IIS01:deploy:
|
IOC:IIS01:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
@@ -400,7 +499,26 @@ IOC:IIS01:deploy:
|
|||||||
needs: ["IOC:build"]
|
needs: ["IOC:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
|
RIOC:IIS01:deploy:
|
||||||
|
stage: deploy
|
||||||
|
tags:
|
||||||
|
- win
|
||||||
|
variables:
|
||||||
|
APP_NAME: MP.RIOC
|
||||||
|
SOL_NAME: MP-RIOC
|
||||||
|
before_script:
|
||||||
|
- *nuget-fix
|
||||||
|
- dotnet restore "$env:SOL_NAME.sln"
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_BRANCH == 'develop'
|
||||||
|
- if: $CI_COMMIT_BRANCH =~ /^feature\/IOC.+/
|
||||||
|
when: always
|
||||||
|
needs: ["RIOC:build"]
|
||||||
|
script:
|
||||||
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
TAB3:IIS01:deploy:
|
TAB3:IIS01:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
@@ -419,10 +537,12 @@ TAB3:IIS01:deploy:
|
|||||||
needs: ["TAB3:build"]
|
needs: ["TAB3:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
# ----- Start DEPLOY master (IIS02/IIS04) -----
|
# --------------------------------
|
||||||
LAND:IIS02:deploy:
|
# DEPLOY master (IIS03/IIS04)
|
||||||
|
# --------------------------------
|
||||||
|
LAND:IIS03:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
@@ -437,28 +557,31 @@ LAND:IIS02:deploy:
|
|||||||
needs: ["LAND:build"]
|
needs: ["LAND:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
PROG:IIS02:deploy:
|
PROG:IIS03:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
variables:
|
variables:
|
||||||
APP_NAME: MP.Prog
|
APP_NAME: MP.Prog
|
||||||
SOL_NAME: MP-PROG
|
SOL_NAME: MP-PROG
|
||||||
|
DEST: office.egalware.com
|
||||||
before_script:
|
before_script:
|
||||||
- *nuget-fix
|
- *nuget-fix
|
||||||
- dotnet restore "$env:SOL_NAME.sln"
|
- dotnet restore "$env:SOL_NAME.sln"
|
||||||
|
- *appsettings-fix
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == 'master'
|
- if: $CI_COMMIT_BRANCH == 'master'
|
||||||
|
- if: $CI_COMMIT_BRANCH == 'develop'
|
||||||
needs: ["PROG:build"]
|
needs: ["PROG:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
STAT:IIS02:deploy:
|
STAT:IIS03:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
@@ -473,15 +596,15 @@ STAT:IIS02:deploy:
|
|||||||
needs: ["STAT:build"]
|
needs: ["STAT:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
MON:IIS02:deploy:
|
MON:IIS03:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
variables:
|
variables:
|
||||||
APP_NAME: MP.Mon
|
APP_NAME: MP.MON
|
||||||
SOL_NAME: MP-MON
|
SOL_NAME: MP-MON
|
||||||
before_script:
|
before_script:
|
||||||
- *nuget-fix
|
- *nuget-fix
|
||||||
@@ -491,10 +614,10 @@ MON:IIS02:deploy:
|
|||||||
needs: ["MON:build"]
|
needs: ["MON:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
SPEC:IIS02:deploy:
|
SPEC:IIS03:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
@@ -509,10 +632,10 @@ SPEC:IIS02:deploy:
|
|||||||
needs: ["SPEC:build"]
|
needs: ["SPEC:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
INVE:IIS02:deploy:
|
INVE:IIS03:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
@@ -527,10 +650,10 @@ INVE:IIS02:deploy:
|
|||||||
needs: ["INVE:build"]
|
needs: ["INVE:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
CONF:IIS02:deploy:
|
CONF:IIS03:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
@@ -545,10 +668,10 @@ CONF:IIS02:deploy:
|
|||||||
needs: ["CONF:build"]
|
needs: ["CONF:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
IOC:IIS02:deploy:
|
IOC:IIS03:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
@@ -563,10 +686,28 @@ IOC:IIS02:deploy:
|
|||||||
needs: ["IOC:build"]
|
needs: ["IOC:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
TAB3:IIS02:deploy:
|
RIOC:IIS03:deploy:
|
||||||
|
stage: deploy
|
||||||
|
tags:
|
||||||
|
- win
|
||||||
|
variables:
|
||||||
|
APP_NAME: MP.RIOC
|
||||||
|
SOL_NAME: MP-RIOC
|
||||||
|
before_script:
|
||||||
|
- *nuget-fix
|
||||||
|
- dotnet restore "$env:SOL_NAME.sln"
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_BRANCH == 'master'
|
||||||
|
needs: ["RIOC:build"]
|
||||||
|
script:
|
||||||
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
|
TAB3:IIS03:deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
@@ -578,13 +719,15 @@ TAB3:IIS02:deploy:
|
|||||||
- dotnet restore "$env:SOL_NAME.sln"
|
- dotnet restore "$env:SOL_NAME.sln"
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == 'master'
|
- if: $CI_COMMIT_BRANCH == 'master'
|
||||||
needs: ["IOC:build"]
|
needs: ["TAB3:build"]
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS03.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PASSWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet publish -p:PublishProfile=IIS04.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=$IIS_PWD -p:AllowUntrustedCertificate=true -p:verbosity=quiet $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
|
||||||
# ----- Start INSTALLER (develop/master) -----
|
# --------------------------------
|
||||||
|
# INSTALLER (develop/master)
|
||||||
|
# --------------------------------
|
||||||
LAND:installer:
|
LAND:installer:
|
||||||
stage: installer
|
stage: installer
|
||||||
tags:
|
tags:
|
||||||
@@ -656,7 +799,7 @@ MON:installer:
|
|||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
variables:
|
variables:
|
||||||
APP_NAME: MP.Mon
|
APP_NAME: MP.MON
|
||||||
SOL_NAME: MP-MON
|
SOL_NAME: MP-MON
|
||||||
NEXUS_PATH: MP-MON
|
NEXUS_PATH: MP-MON
|
||||||
before_script:
|
before_script:
|
||||||
@@ -783,7 +926,31 @@ IOC:installer:
|
|||||||
- *hashBuild
|
- *hashBuild
|
||||||
- *nexusUpload
|
- *nexusUpload
|
||||||
|
|
||||||
# ----- Start RELEASE (tags only) -----
|
RIOC:installer:
|
||||||
|
stage: installer
|
||||||
|
tags:
|
||||||
|
- win
|
||||||
|
variables:
|
||||||
|
APP_NAME: MP.RIOC
|
||||||
|
SOL_NAME: MP-RIOC
|
||||||
|
NEXUS_PATH: MP-RIOC
|
||||||
|
before_script:
|
||||||
|
- *nuget-fix
|
||||||
|
- dotnet restore "$env:SOL_NAME.sln"
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_BRANCH == 'master'
|
||||||
|
- if: $CI_COMMIT_BRANCH == 'develop'
|
||||||
|
needs: ["IOC:build"]
|
||||||
|
script:
|
||||||
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
- dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release $env:APP_NAME/$env:APP_NAME.csproj -o:publish -p:verbosity=quiet
|
||||||
|
# qui il deploy su nexus...
|
||||||
|
- *hashBuild
|
||||||
|
- *nexusUpload
|
||||||
|
|
||||||
|
# --------------------------------
|
||||||
|
# RELEASE (tags only + sdk)
|
||||||
|
# --------------------------------
|
||||||
LAND:release:
|
LAND:release:
|
||||||
stage: release
|
stage: release
|
||||||
tags:
|
tags:
|
||||||
@@ -805,6 +972,28 @@ LAND:release:
|
|||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet
|
- dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet
|
||||||
|
|
||||||
|
LAND:SDK:release:
|
||||||
|
stage: release
|
||||||
|
tags:
|
||||||
|
- win
|
||||||
|
variables:
|
||||||
|
APP_NAME: MP.AppAuth
|
||||||
|
SOL_NAME: MP-LAND
|
||||||
|
before_script:
|
||||||
|
- *nuget-fix
|
||||||
|
- dotnet restore "$env:SOL_NAME.sln"
|
||||||
|
- *version-fix
|
||||||
|
- *nuspec-fix
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_BRANCH == 'master'
|
||||||
|
needs: ["LAND:build"]
|
||||||
|
script:
|
||||||
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj -c Release
|
||||||
|
- '& Remove-Item *.nupkg'
|
||||||
|
- '& $env:NUGET_PATH pack "EgwProxy.MP.Core.Release.nuspec"'
|
||||||
|
- '& "$env:NUGET_PATH" setapikey $NUGET_API_KEY -source http://nexus.steamware.net/repository/nuget-hosted'
|
||||||
|
- '& "$env:NUGET_PATH" push *$env:NUM_REL.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
|
||||||
|
|
||||||
PROG:release:
|
PROG:release:
|
||||||
stage: release
|
stage: release
|
||||||
tags:
|
tags:
|
||||||
@@ -852,7 +1041,7 @@ MON:release:
|
|||||||
tags:
|
tags:
|
||||||
- win
|
- win
|
||||||
variables:
|
variables:
|
||||||
APP_NAME: MP.Mon
|
APP_NAME: MP.MON
|
||||||
SOL_NAME: MP-MON
|
SOL_NAME: MP-MON
|
||||||
NEXUS_PATH: MP-MON
|
NEXUS_PATH: MP-MON
|
||||||
before_script:
|
before_script:
|
||||||
@@ -866,7 +1055,7 @@ MON:release:
|
|||||||
- publish/
|
- publish/
|
||||||
script:
|
script:
|
||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet
|
- dotnet publish -c Release -o ./publish $env:APP_NAME.csproj -p:verbosity=quiet
|
||||||
|
|
||||||
SPEC:release:
|
SPEC:release:
|
||||||
stage: release
|
stage: release
|
||||||
@@ -952,3 +1141,24 @@ IOC:release:
|
|||||||
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
- dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet
|
- dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet
|
||||||
|
|
||||||
|
RIOC:release:
|
||||||
|
stage: release
|
||||||
|
tags:
|
||||||
|
- win
|
||||||
|
variables:
|
||||||
|
APP_NAME: MP.RIOC
|
||||||
|
SOL_NAME: MP-RIOC
|
||||||
|
NEXUS_PATH: MP-RIOC
|
||||||
|
before_script:
|
||||||
|
- *nuget-fix
|
||||||
|
- dotnet restore "$env:SOL_NAME.sln"
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_TAG
|
||||||
|
needs: ["IOC:build"]
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- publish/
|
||||||
|
script:
|
||||||
|
- dotnet build $env:APP_NAME/$env:APP_NAME.csproj
|
||||||
|
- dotnet publish -c Release -o ./publish $env:APP_NAME/$env:APP_NAME.csproj -p:verbosity=quiet
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-1
@@ -10,7 +10,7 @@
|
|||||||
"request": "launch",
|
"request": "launch",
|
||||||
"preLaunchTask": "build",
|
"preLaunchTask": "build",
|
||||||
// If you have changed target frameworks, make sure to update the program path.
|
// If you have changed target frameworks, make sure to update the program path.
|
||||||
"program": "${workspaceFolder}/MP.Stats/bin/Debug/net6.0/MP.Stats.dll",
|
"program": "${workspaceFolder}/MP.Stats/bin/Debug/net8.0/MP.Stats.dll",
|
||||||
"args": [],
|
"args": [],
|
||||||
"cwd": "${workspaceFolder}/MP.Stats",
|
"cwd": "${workspaceFolder}/MP.Stats",
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# MAPO-CORE Agent Instructions
|
||||||
|
|
||||||
|
## Core Context
|
||||||
|
- **Primary Goal**: Optimization and refactoring of the `MP-SPEC.sln` solution, focusing on migrating legacy Redis/DB caching to `FusionCache` (Memory + Redis + DB) in `MP.SPEC\Data\MpDataService.cs`.
|
||||||
|
- **Language**: C# (primary), PowerShell (scripts).
|
||||||
|
- **Documentation/Comments**: MUST be in **Italiano**.
|
||||||
|
- **Code Style**: Maintain existing region organization (`#region Public Methods`, etc.).
|
||||||
|
- **Reference Docs**: See `Refactor_Plan.md` for the current migration status and detailed strategy.
|
||||||
|
|
||||||
|
## Development Workflow
|
||||||
|
- **Build & Verification**:
|
||||||
|
- Use `./build_all_par.ps1 --agent` to build all solutions silently.
|
||||||
|
- Always verify that changes do not leave partial traces of old classes that break compilation.
|
||||||
|
- **Refactoring Strategy (`MpDataService.cs`)**:
|
||||||
|
- Use `GetOrFetchAsync<T>(string operationName, string cacheKey, Func<Task<T>> fetchFunc, TimeSpan expiration, params string[] tags)` as the standard for all data access.
|
||||||
|
- Target methods currently using manual `redisDb.StringGetAsync` / `StringSetAsync` patterns.
|
||||||
|
- **Testing**:
|
||||||
|
- Check the codebase for existing testing patterns before proposing new ones.
|
||||||
|
|
||||||
|
## Architecture Notes
|
||||||
|
- **Multi-Layer Caching**: The system is transitioning from a dual-layer (Redis + DB) to a triple-layer approach via `IFusionCache`.
|
||||||
|
- **Service Responsibility**: `MpDataService` is the central hub for data access, interacting with `MpSpecController` (EFCore) and `MpMongoController` (MongoDB).
|
||||||
|
- **Key Management**: Cache keys are heavily managed via `Utils.redis...` constants. Use these to prevent key mismatches.
|
||||||
|
|
||||||
BIN
Binary file not shown.
+1
-1
@@ -89,7 +89,7 @@ ExecuteLog "7z x ""$SourceDir\$ZipFile"" "
|
|||||||
|
|
||||||
# step 3 : replica applicazione
|
# step 3 : replica applicazione
|
||||||
Write-Host "START copy step"
|
Write-Host "START copy step"
|
||||||
ExecuteLog "robocopy '$utilDir\publish\net6.0\' '$DestDir' /MIR /Z /LOG:'$logMirror'"
|
ExecuteLog "robocopy '$utilDir\publish\net8.0\' '$DestDir' /MIR /Z /LOG:'$logMirror'"
|
||||||
Write-Host "END copy step"
|
Write-Host "END copy step"
|
||||||
|
|
||||||
# step 4 : riavvio pool
|
# step 4 : riavvio pool
|
||||||
|
|||||||
@@ -0,0 +1,57 @@
|
|||||||
|
<Project>
|
||||||
|
<PropertyGroup>
|
||||||
|
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||||
|
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />
|
||||||
|
<PackageVersion Include="Blazored.SessionStorage" Version="2.4.0" />
|
||||||
|
<PackageVersion Include="DiffMatchPatch" Version="1.0.3" />
|
||||||
|
<PackageVersion Include="EgwCoreLib.Razor" Version="1.5.2605.511" />
|
||||||
|
<PackageVersion Include="EgwCoreLib.Utils" Version="1.5.2605.511" />
|
||||||
|
<PackageVersion Include="MailKit" Version="4.16.0" />
|
||||||
|
<PackageVersion Include="Majorsoft.Blazor.Components.Debounce" Version="1.5.0" />
|
||||||
|
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.25" />
|
||||||
|
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.25" />
|
||||||
|
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.25" />
|
||||||
|
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.25" />
|
||||||
|
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.25" />
|
||||||
|
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.25" />
|
||||||
|
<PackageVersion Include="Microsoft.AspNetCore.Http.Connections.Common" Version="8.0.25" />
|
||||||
|
<PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.25" />
|
||||||
|
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="6.0.36" />
|
||||||
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.36" />
|
||||||
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.36" />
|
||||||
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.36" />
|
||||||
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.36" />
|
||||||
|
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.25" />
|
||||||
|
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.1" />
|
||||||
|
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.17" />
|
||||||
|
<PackageVersion Include="MongoDB.Driver" Version="2.19.0" />
|
||||||
|
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
|
<PackageVersion Include="NLog" Version="6.1.3" />
|
||||||
|
<PackageVersion Include="NLog.Targets.OpenTelemetryProtocol" Version="1.2.6" />
|
||||||
|
<PackageVersion Include="NLog.Web.AspNetCore" Version="6.1.3" />
|
||||||
|
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
|
||||||
|
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
|
||||||
|
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
|
||||||
|
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
|
||||||
|
<PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.15.2" />
|
||||||
|
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.15.0-beta.1" />
|
||||||
|
<PackageVersion Include="Snappier" Version="1.3.1" />
|
||||||
|
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
|
||||||
|
<PackageVersion Include="RestSharp" Version="112.0.0" />
|
||||||
|
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
|
||||||
|
<PackageVersion Include="StackExchange.Redis" Version="2.12.14" />
|
||||||
|
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
|
||||||
|
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
|
||||||
|
<PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="6.9.0" />
|
||||||
|
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.9.0" />
|
||||||
|
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.9.0" />
|
||||||
|
<PackageVersion Include="YamlDotNet" Version="16.1.0" />
|
||||||
|
<PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
|
||||||
|
<PackageVersion Include="ZiggyCreatures.FusionCache" Version="2.6.0" />
|
||||||
|
<PackageVersion Include="ZiggyCreatures.FusionCache.Backplane.StackExchangeRedis" Version="2.6.0" />
|
||||||
|
<PackageVersion Include="ZiggyCreatures.FusionCache.Serialization.NewtonsoftJson" Version="2.6.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
using System.Reflection;
|
||||||
|
|
||||||
|
namespace Egw.Core
|
||||||
|
{
|
||||||
|
public class Utils
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Effettua salvataggio in file di un generico oggetto in formato CSV
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <param name="reportData"></param>
|
||||||
|
/// <param name="path"></param>
|
||||||
|
/// <param name="separator">Separatore da impiegare</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static async Task SaveToCsv<T>(List<T> reportData, string path, char separator)
|
||||||
|
{
|
||||||
|
// 1. Recuperiamo le proprietà del tipo T una sola volta (Risolve i problemi di performance)
|
||||||
|
PropertyInfo[] properties = typeof(T).GetProperties();
|
||||||
|
|
||||||
|
var lines = new List<string>();
|
||||||
|
|
||||||
|
// 2. Creiamo l'header usando il separatore corretto (Risolve il bug del ";" fisso)
|
||||||
|
var header = string.Join(separator, properties.Select(p => p.Name));
|
||||||
|
lines.Add(header);
|
||||||
|
|
||||||
|
// 3. Estraiamo i valori gestendo i possibili null (Risolve il tuo warning)
|
||||||
|
var valueLines = reportData
|
||||||
|
.Where(row => row != null)
|
||||||
|
.Select(row => string.Join(separator, properties.Select(p => p.GetValue(row)?.ToString() ?? string.Empty)));
|
||||||
|
|
||||||
|
lines.AddRange(valueLines);
|
||||||
|
|
||||||
|
// 4. Utilizziamo il metodo di scrittura asincrono nativo di .NET
|
||||||
|
await File.WriteAllLinesAsync(path, lines);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
|
<metadata>
|
||||||
|
<id>EgwProxy.MP.Core</id>
|
||||||
|
<version>#version#</version>
|
||||||
|
<title>EgwProxy.MP.Core</title>
|
||||||
|
<authors>Samuele E. Locatelli, EgalWare</authors>
|
||||||
|
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||||
|
<license type="expression">MIT</license>
|
||||||
|
<description>Libreria accesso DB MP-Core x sync dati tabelle Config/Vocabolario</description>
|
||||||
|
<releaseNotes>#releaseNotes#</releaseNotes>
|
||||||
|
<copyright>#copyright#</copyright>
|
||||||
|
<tags>EgwProxy.MP.Core DB</tags>
|
||||||
|
<dependencies>
|
||||||
|
<dependency id="Microsoft.EntityFrameworkCore" version="6.0.9" />
|
||||||
|
<dependency id="Microsoft.EntityFrameworkCore.Design" version="6.0.9" />
|
||||||
|
<dependency id="Microsoft.EntityFrameworkCore.Relational" version="6.0.9" />
|
||||||
|
<dependency id="Microsoft.EntityFrameworkCore.SqlServer" version="6.0.9" />
|
||||||
|
<dependency id="Microsoft.EntityFrameworkCore.Tools" version="6.0.9" />
|
||||||
|
<dependency id="NLog" version="5.0.4" />
|
||||||
|
</dependencies>
|
||||||
|
</metadata>
|
||||||
|
<files>
|
||||||
|
<file src="MP.AppAuth\bin\Debug\MP.AppAuth*.dll" target="lib" />
|
||||||
|
<file src="MP.AppAuth\bin\Debug\MP.AppAuth*.config" target="lib" />
|
||||||
|
<file src="MP.AppAuth\bin\Debug\MP.AppAuth*.pdb" target="lib" />
|
||||||
|
</files>
|
||||||
|
</package>
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
|
<metadata>
|
||||||
|
<id>EgwProxy.MP.Core</id>
|
||||||
|
<version>#version#</version>
|
||||||
|
<title>EgwProxy.MP.Core</title>
|
||||||
|
<authors>Samuele E. Locatelli, EgalWare</authors>
|
||||||
|
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||||
|
<license type="expression">MIT</license>
|
||||||
|
<description>Libreria accesso DB MP-Core x sync dati tabelle Config/Vocabolario</description>
|
||||||
|
<releaseNotes>#releaseNotes#</releaseNotes>
|
||||||
|
<copyright>#copyright#</copyright>
|
||||||
|
<tags>EgwProxy.MP.Core DB</tags>
|
||||||
|
<dependencies>
|
||||||
|
<dependency id="Microsoft.EntityFrameworkCore" version="6.0.9" />
|
||||||
|
<dependency id="Microsoft.EntityFrameworkCore.Design" version="6.0.9" />
|
||||||
|
<dependency id="Microsoft.EntityFrameworkCore.Relational" version="6.0.9" />
|
||||||
|
<dependency id="Microsoft.EntityFrameworkCore.SqlServer" version="6.0.9" />
|
||||||
|
<dependency id="Microsoft.EntityFrameworkCore.Tools" version="6.0.9" />
|
||||||
|
<dependency id="NLog" version="5.0.4" />
|
||||||
|
</dependencies>
|
||||||
|
</metadata>
|
||||||
|
<files>
|
||||||
|
<file src="MP.AppAuth\bin\Release\MP.AppAuth*.dll" target="lib" />
|
||||||
|
<file src="MP.AppAuth\bin\Release\MP.AppAuth*.config" target="lib" />
|
||||||
|
</files>
|
||||||
|
</package>
|
||||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1 @@
|
|||||||
|
{"_type":"export","__export_format":4,"__export_date":"2024-10-23T15:45:49.150Z","__export_source":"insomnia.desktop.app:v2023.5.8","resources":[{"_id":"req_bb23a3e0a78f44999350ddcefebaaf82","parentId":"wrk_0d1a3f6f42fe486dacbeeea3026c648b","modified":1729691634502,"created":1729691518776,"url":"{{ _.BASE_URL }}/api/Health","name":"Health","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1680616613017,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"wrk_0d1a3f6f42fe486dacbeeea3026c648b","parentId":null,"modified":1729691518738,"created":1729691518738,"name":"MAPO-PROG","description":"","scope":"collection","_type":"workspace"},{"_id":"req_2b3ff677e75040ed9dfe30463fb5d408","parentId":"fld_cf0e8b6c31334d67bc421487d31a5540","modified":1729691689274,"created":1729691666872,"url":"{{ _.BASE_URL }}/api/FileChange","name":"FileChange Health","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1729691677997,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"fld_cf0e8b6c31334d67bc421487d31a5540","parentId":"wrk_0d1a3f6f42fe486dacbeeea3026c648b","modified":1729691675552,"created":1729691673364,"name":"FileChange","description":"","environment":{},"environmentPropertyOrder":null,"metaSortKey":-1680616270148.125,"_type":"request_group"},{"_id":"req_8fa584b2405b4c3588e1da50c6c02cbc","parentId":"fld_cf0e8b6c31334d67bc421487d31a5540","modified":1729691870054,"created":1729691818717,"url":"{{ _.BASE_URL }}/api/FileChange/approve/ALL?numDayPrev=7","name":"FileChange AutoSave","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1726323968489,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_b28dbcb90b9f4a30ae621f46ca80abf1","parentId":"fld_cf0e8b6c31334d67bc421487d31a5540","modified":1729698051601,"created":1729698043734,"url":"{{ _.BASE_URL }}/api/FileChange/check/ALL?numDayPrev=0","name":"FileChange CheckAll","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1724640113735,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"env_f533a867e5e74bc7a712974eb5185fe2","parentId":"wrk_0d1a3f6f42fe486dacbeeea3026c648b","modified":1729691518740,"created":1729691518740,"name":"Base Environment","data":{},"dataPropertyOrder":{},"color":null,"isPrivate":false,"metaSortKey":1680615228640,"_type":"environment"},{"_id":"jar_52975036fdb946749a04bf8b105649dc","parentId":"wrk_0d1a3f6f42fe486dacbeeea3026c648b","modified":1729691518752,"created":1729691518752,"name":"Default Jar","cookies":[],"_type":"cookie_jar"},{"_id":"spc_034d8153209c43289ef94bb511a381e4","parentId":"wrk_0d1a3f6f42fe486dacbeeea3026c648b","modified":1729691518782,"created":1729691518757,"fileName":"MAPO-PROG","contents":"","contentType":"yaml","_type":"api_spec"},{"_id":"env_6acd2ea246a54f2fa42dfa7191704e4f","parentId":"env_f533a867e5e74bc7a712974eb5185fe2","modified":1729691571662,"created":1729691518742,"name":"DEV","data":{"BASE_URL":"https://localhost:5001"},"dataPropertyOrder":{"&":["BASE_URL"]},"color":"#ff0000","isPrivate":false,"metaSortKey":1680615301619,"_type":"environment"},{"_id":"env_add3f929a9774e949eaacdfef9669698","parentId":"env_f533a867e5e74bc7a712974eb5185fe2","modified":1729691576277,"created":1729691518746,"name":"IIS01","data":{"BASE_URL":"https://iis01.egalware.com/MP/PROG"},"dataPropertyOrder":{"&":["BASE_URL"]},"color":"#6600ff","isPrivate":false,"metaSortKey":1680615328099,"_type":"environment"},{"_id":"env_78f831742ec84968878b6bb3e2dbbee3","parentId":"env_f533a867e5e74bc7a712974eb5185fe2","modified":1729691592437,"created":1729691579006,"name":"PROD","data":{"BASE_URL":"https://iis01.egalware.com/MP/PROG"},"dataPropertyOrder":{"&":["BASE_URL"]},"color":"#6600ff","isPrivate":false,"metaSortKey":1692979703520,"_type":"environment"}]}
|
||||||
@@ -1 +1 @@
|
|||||||
{"_type":"export","__export_format":4,"__export_date":"2023-04-04T15:23:33.215Z","__export_source":"insomnia.desktop.app:v2023.1.0","resources":[{"_id":"req_cd57cb8728854cd5a7d026b9aba60047","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680616613886,"created":1680616613017,"url":"https://localhost:7212/api/Recipe/GetRecipe?idxPODL=1656","name":"New Request","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1680616613017,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","parentId":null,"modified":1680615228636,"created":1680615228636,"name":"MAPO-SPEC","description":"","scope":"collection","_type":"workspace"},{"_id":"req_4d233d6fb970485ea929bdffdcfae05a","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680621773464,"created":1680615246346,"url":"{{ _.BASE_URL }}/api/Recipe/GetRecipe?idxPODL=1656","name":"GET RECIPE (calc)","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1680615241541.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_278d5f0a6555457e88ad2e58cfdaae23","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680621754168,"created":1680615436433,"url":"{{ BASE_URL }}/api/RecipeArchive/GetFile?idxMacc=SIMUL_02&fileName=10002.xml","name":"GET FILE (from archive)","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1679846511868.4375,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"env_ea1cd34b6839260f9a1edf3546f3c605bb6f3a2c","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680615377532,"created":1680615228640,"name":"Base Environment","data":{},"dataPropertyOrder":{},"color":null,"isPrivate":false,"metaSortKey":1680615228640,"_type":"environment"},{"_id":"jar_ea1cd34b6839260f9a1edf3546f3c605bb6f3a2c","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680615228642,"created":1680615228642,"name":"Default Jar","cookies":[],"_type":"cookie_jar"},{"_id":"spc_b61936e963e34a759001c6a22ad8da60","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680615228637,"created":1680615228637,"fileName":"MAPO-SPEC","contents":"","contentType":"yaml","_type":"api_spec"},{"_id":"env_2757d8ba1b17435987847d0499e9369e","parentId":"env_ea1cd34b6839260f9a1edf3546f3c605bb6f3a2c","modified":1680616993850,"created":1680615301619,"name":"DEV","data":{"BASE_URL":"https://localhost:7212"},"dataPropertyOrder":{"&":["BASE_URL"]},"color":"#ff0000","isPrivate":false,"metaSortKey":1680615301619,"_type":"environment"},{"_id":"env_f5b6aef3c2b444aab04c9056404d63f9","parentId":"env_ea1cd34b6839260f9a1edf3546f3c605bb6f3a2c","modified":1680616996428,"created":1680615328099,"name":"IIS01","data":{"BASE_URL":"https://iis01.egalware.com/MP/SPEC"},"dataPropertyOrder":{"&":["BASE_URL"]},"color":"#6600ff","isPrivate":false,"metaSortKey":1680615328099,"_type":"environment"}]}
|
{"_type":"export","__export_format":4,"__export_date":"2024-10-23T15:46:09.187Z","__export_source":"insomnia.desktop.app:v2023.5.8","resources":[{"_id":"req_cd57cb8728854cd5a7d026b9aba60047","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680616613886,"created":1680616613017,"url":"https://localhost:7212/api/Recipe/GetRecipe?idxPODL=1656","name":"New Request","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1680616613017,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","parentId":null,"modified":1680615228636,"created":1680615228636,"name":"MAPO-SPEC","description":"","scope":"collection","_type":"workspace"},{"_id":"req_4d233d6fb970485ea929bdffdcfae05a","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680621773464,"created":1680615246346,"url":"{{ _.BASE_URL }}/api/Recipe/GetRecipe?idxPODL=1656","name":"GET RECIPE (calc)","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1680615241541.5,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"req_278d5f0a6555457e88ad2e58cfdaae23","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680621754168,"created":1680615436433,"url":"{{ BASE_URL }}/api/RecipeArchive/GetFile?idxMacc=SIMUL_02&fileName=10002.xml","name":"GET FILE (from archive)","description":"","method":"GET","body":{},"parameters":[],"headers":[],"authentication":{},"metaSortKey":-1679846511868.4375,"isPrivate":false,"settingStoreCookies":true,"settingSendCookies":true,"settingDisableRenderRequestBody":false,"settingEncodeUrl":true,"settingRebuildPath":true,"settingFollowRedirects":"global","_type":"request"},{"_id":"env_ea1cd34b6839260f9a1edf3546f3c605bb6f3a2c","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680615377532,"created":1680615228640,"name":"Base Environment","data":{},"dataPropertyOrder":{},"color":null,"isPrivate":false,"metaSortKey":1680615228640,"_type":"environment"},{"_id":"jar_ea1cd34b6839260f9a1edf3546f3c605bb6f3a2c","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680615228642,"created":1680615228642,"name":"Default Jar","cookies":[],"_type":"cookie_jar"},{"_id":"spc_b61936e963e34a759001c6a22ad8da60","parentId":"wrk_86debe1a96ca41cdbfb53ed71a9d6d84","modified":1680615228637,"created":1680615228637,"fileName":"MAPO-SPEC","contents":"","contentType":"yaml","_type":"api_spec"},{"_id":"env_2757d8ba1b17435987847d0499e9369e","parentId":"env_ea1cd34b6839260f9a1edf3546f3c605bb6f3a2c","modified":1680616993850,"created":1680615301619,"name":"DEV","data":{"BASE_URL":"https://localhost:7212"},"dataPropertyOrder":{"&":["BASE_URL"]},"color":"#ff0000","isPrivate":false,"metaSortKey":1680615301619,"_type":"environment"},{"_id":"env_f5b6aef3c2b444aab04c9056404d63f9","parentId":"env_ea1cd34b6839260f9a1edf3546f3c605bb6f3a2c","modified":1680616996428,"created":1680615328099,"name":"IIS01","data":{"BASE_URL":"https://iis01.egalware.com/MP/SPEC"},"dataPropertyOrder":{"&":["BASE_URL"]},"color":"#6600ff","isPrivate":false,"metaSortKey":1680615328099,"_type":"environment"}]}
|
||||||
@@ -1,15 +1,15 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
|
<PackageReference Include="Newtonsoft.Json" />
|
||||||
<PackageReference Include="NLog" Version="5.1.1" />
|
<PackageReference Include="NLog" />
|
||||||
<PackageReference Include="YamlDotNet" Version="13.0.0" />
|
<PackageReference Include="YamlDotNet" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using YamlDotNet.Serialization.NamingConventions;
|
|||||||
using YamlDotNet.Serialization;
|
using YamlDotNet.Serialization;
|
||||||
using static IobConf.Core.EnumConf;
|
using static IobConf.Core.EnumConf;
|
||||||
using NLog;
|
using NLog;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
// <Auto-Generated>
|
// <Auto-Generated>
|
||||||
// This is here so CodeMaid doesn't reorganize this document
|
// This is here so CodeMaid doesn't reorganize this document
|
||||||
@@ -23,6 +24,63 @@ namespace IobConf.Core
|
|||||||
Log = LogManager.GetCurrentClassLogger();
|
Log = LogManager.GetCurrentClassLogger();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Init classe configurazione da file
|
||||||
|
/// </summary>
|
||||||
|
public IobConfTree(string confFilePath)
|
||||||
|
{
|
||||||
|
Log = LogManager.GetCurrentClassLogger();
|
||||||
|
if (File.Exists(confFilePath))
|
||||||
|
{
|
||||||
|
IobConfTree newConfObj = new IobConfTree();
|
||||||
|
// verifico TIPO file...
|
||||||
|
string fileExt = Path.GetExtension(confFilePath);
|
||||||
|
string fileName = Path.GetFileName(confFilePath);
|
||||||
|
string rawData = File.ReadAllText(confFilePath);
|
||||||
|
if (!string.IsNullOrEmpty(rawData))
|
||||||
|
{
|
||||||
|
// leggo in base al tipo...
|
||||||
|
switch (fileExt)
|
||||||
|
{
|
||||||
|
case "yaml":
|
||||||
|
case "yml":
|
||||||
|
var deserializer = new DeserializerBuilder()
|
||||||
|
.WithNamingConvention(CamelCaseNamingConvention.Instance)
|
||||||
|
.Build();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
newConfObj = deserializer.Deserialize<IobConfTree>(rawData);
|
||||||
|
}
|
||||||
|
catch (Exception exc)
|
||||||
|
{
|
||||||
|
//lgError($"Eccezione in LoadFromYaml{Environment.NewLine}{exc}");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (newConfObj != null)
|
||||||
|
{
|
||||||
|
// ora copio in oggetto corrente...
|
||||||
|
CncData = newConfObj.CncData;
|
||||||
|
CodIOB = newConfObj.CodIOB;
|
||||||
|
ConfFileName = fileName;
|
||||||
|
Customer = newConfObj.Customer;
|
||||||
|
GeneralCom = newConfObj.GeneralCom;
|
||||||
|
InputDataProc = newConfObj.InputDataProc;
|
||||||
|
IobManConf = newConfObj.IobManConf;
|
||||||
|
IobType = newConfObj.IobType;
|
||||||
|
Model = newConfObj.Model;
|
||||||
|
OptPar = newConfObj.OptPar;
|
||||||
|
ReleaseVers = newConfObj.ReleaseVers;
|
||||||
|
ServerMES = newConfObj.ServerMES;
|
||||||
|
TempoCiclo = newConfObj.TempoCiclo;
|
||||||
|
Vendor = newConfObj.Vendor;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Restituisce un oggetto di conf leggendo INI ed effettuando conversione
|
/// Restituisce un oggetto di conf leggendo INI ed effettuando conversione
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -80,7 +138,7 @@ namespace IobConf.Core
|
|||||||
newConfObj.ServerMES.Transport = MpIp.StartsWith("https://") ? "https" : "http";
|
newConfObj.ServerMES.Transport = MpIp.StartsWith("https://") ? "https" : "http";
|
||||||
newConfObj.ServerMES.IpAddr = MpIp.Replace($"{newConfObj.ServerMES.Transport}://", ""); // tolgo http/https...
|
newConfObj.ServerMES.IpAddr = MpIp.Replace($"{newConfObj.ServerMES.Transport}://", ""); // tolgo http/https...
|
||||||
}
|
}
|
||||||
|
|
||||||
// Altro (versione, ...)
|
// Altro (versione, ...)
|
||||||
newConfObj.ReleaseVers = $"{System.Reflection.Assembly.GetExecutingAssembly().GetName().Version}";
|
newConfObj.ReleaseVers = $"{System.Reflection.Assembly.GetExecutingAssembly().GetName().Version}";
|
||||||
newConfObj.IobManConf.MinDeltaSec = fIni.ReadInteger("IOB", "MinDeltaSec", 6);
|
newConfObj.IobManConf.MinDeltaSec = fIni.ReadInteger("IOB", "MinDeltaSec", 6);
|
||||||
@@ -114,6 +172,35 @@ namespace IobConf.Core
|
|||||||
return newConfObj;
|
return newConfObj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Restituisce un oggetto di conf deserializzando lo Yaml relativo
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="yamlFilePath"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static IobConfTree LoadFromYaml(string yamlFilePath)
|
||||||
|
{
|
||||||
|
IobConfTree newConfObj = new IobConfTree();
|
||||||
|
if (File.Exists(yamlFilePath))
|
||||||
|
{
|
||||||
|
string rawData = File.ReadAllText(yamlFilePath);
|
||||||
|
if (!string.IsNullOrEmpty(rawData))
|
||||||
|
{
|
||||||
|
var deserializer = new DeserializerBuilder()
|
||||||
|
.WithNamingConvention(CamelCaseNamingConvention.Instance)
|
||||||
|
.Build();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
newConfObj = deserializer.Deserialize<IobConfTree>(rawData);
|
||||||
|
}
|
||||||
|
catch (Exception exc)
|
||||||
|
{
|
||||||
|
//lgError($"Eccezione in LoadFromYaml{Environment.NewLine}{exc}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return newConfObj;
|
||||||
|
}
|
||||||
|
|
||||||
#region Logging
|
#region Logging
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -11,48 +11,57 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-4">
|
@if (!fileOk)
|
||||||
<div class="card">
|
{
|
||||||
<div class="card-header d-flex justify-content-between">
|
<div class="alert alert-warning">
|
||||||
<div class="px-1">
|
No file found
|
||||||
<h2>INI</h2>
|
</div>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<div class="col-4">
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-header d-flex justify-content-between">
|
||||||
|
<div class="px-1">
|
||||||
|
<h2>INI</h2>
|
||||||
|
</div>
|
||||||
|
<div class="px-1">
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="px-1">
|
<div class="card-body small textConsensed">
|
||||||
|
<p>@confINI</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body small textConsensed">
|
|
||||||
<p>@confINI</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="col-4">
|
||||||
<div class="col-4">
|
<div class="card">
|
||||||
<div class="card">
|
<div class="card-header d-flex justify-content-between">
|
||||||
<div class="card-header d-flex justify-content-between">
|
<div class="px-1">
|
||||||
<div class="px-1">
|
<h2>JSON</h2>
|
||||||
<h2>JSON</h2>
|
</div>
|
||||||
|
<div class="px-1">
|
||||||
|
<button class="btn btn-sm btn-primary" @onclick="() => SaveJson()">Save Json</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="px-1">
|
<div class="card-body small textConsensed">
|
||||||
<button class="btn btn-sm btn-primary" @onclick="() => SaveJson()">Save Json</button>
|
<p>@confJson</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body small textConsensed">
|
|
||||||
<p>@confJson</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="col-4">
|
||||||
<div class="col-4">
|
<div class="card">
|
||||||
<div class="card">
|
<div class="card-header d-flex justify-content-between">
|
||||||
<div class="card-header d-flex justify-content-between">
|
<div class="px-1">
|
||||||
<div class="px-1">
|
<h2>YAML</h2>
|
||||||
<h2>YAML</h2>
|
</div>
|
||||||
|
<div class="px-1">
|
||||||
|
<button class="btn btn-sm btn-primary" @onclick="() => SaveYaml()">Save Yaml</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="px-1">
|
<div class="card-body small textConsensed">
|
||||||
<button class="btn btn-sm btn-primary" @onclick="() => SaveYaml()">Save Yaml</button>
|
<p>@confYaml</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body small textConsensed">
|
|
||||||
<p>@confYaml</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
}
|
||||||
</div>
|
</div>
|
||||||
@@ -7,15 +7,23 @@ namespace IobConf.UI.Components
|
|||||||
{
|
{
|
||||||
#region Public Methods
|
#region Public Methods
|
||||||
|
|
||||||
public async Task LoadINI()
|
public void LoadINI()
|
||||||
{
|
{
|
||||||
checkOutDir();
|
checkOutDir();
|
||||||
await Task.Delay(1);
|
if (File.Exists(iniPath))
|
||||||
rawFileContent = File.ReadAllText(iniPath);
|
{
|
||||||
confINI=getMarkup(rawFileContent);
|
fileOk = true;
|
||||||
CurrentConf = IobConfTree.LoadFromINI(iniPath);
|
rawFileContent = File.ReadAllText(iniPath);
|
||||||
updateConf();
|
confINI = getMarkup(rawFileContent);
|
||||||
|
CurrentConf = IobConfTree.LoadFromINI(iniPath);
|
||||||
|
updateConf();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fileOk = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task SaveJson()
|
public async Task SaveJson()
|
||||||
{
|
{
|
||||||
checkOutDir();
|
checkOutDir();
|
||||||
@@ -32,13 +40,33 @@ namespace IobConf.UI.Components
|
|||||||
CurrentConf.SaveYaml(fileName);
|
CurrentConf.SaveYaml(fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateConf()
|
#endregion Public Methods
|
||||||
|
|
||||||
|
#region Protected Properties
|
||||||
|
|
||||||
|
protected MarkupString confINI { get; set; }
|
||||||
|
protected MarkupString confJson { get; set; }
|
||||||
|
protected MarkupString confYaml { get; set; }
|
||||||
|
protected IobConfTree CurrentConf { get; set; } = new IobConfTree();
|
||||||
|
protected bool fileOk { get; set; } = false;
|
||||||
|
|
||||||
|
protected string iniPath
|
||||||
{
|
{
|
||||||
// aggiorno conf JSON/YAML
|
get => _iniPath;
|
||||||
confJson = getMarkup(CurrentConf.GetJson());
|
set
|
||||||
confYaml = getMarkup(CurrentConf.GetYaml());
|
{
|
||||||
|
if (!iniPath.Equals(value))
|
||||||
|
{
|
||||||
|
_iniPath = value;
|
||||||
|
LoadINI();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endregion Protected Properties
|
||||||
|
|
||||||
|
#region Protected Methods
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Converte la stringa in formato markup valido
|
/// Converte la stringa in formato markup valido
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -49,40 +77,26 @@ namespace IobConf.UI.Components
|
|||||||
return new MarkupString(rawData.Replace("\n", "<br/>").Replace(" ", " "));
|
return new MarkupString(rawData.Replace("\n", "<br/>").Replace(" ", " "));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected string iniPath = @"C:\temp\DATA\CONF\SIMUL_01.ini";
|
|
||||||
|
|
||||||
#endregion Public Methods
|
|
||||||
|
|
||||||
#region Protected Fields
|
|
||||||
|
|
||||||
protected string baseDir = @"c:\temp\IobConf";
|
|
||||||
|
|
||||||
protected string CodIOB = "NewIOB_00";
|
|
||||||
|
|
||||||
#endregion Protected Fields
|
|
||||||
|
|
||||||
#region Protected Properties
|
|
||||||
|
|
||||||
protected MarkupString confINI { get; set; }
|
|
||||||
protected MarkupString confJson { get; set; }
|
|
||||||
|
|
||||||
protected MarkupString confYaml { get; set; }
|
|
||||||
|
|
||||||
protected string rawFileContent = "";
|
|
||||||
|
|
||||||
protected IobConfTree CurrentConf { get; set; } = new IobConfTree();
|
|
||||||
|
|
||||||
#endregion Protected Properties
|
|
||||||
|
|
||||||
#region Protected Methods
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
await LoadINI();
|
LoadINI();
|
||||||
|
await Task.Delay(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion Protected Methods
|
#endregion Protected Methods
|
||||||
|
|
||||||
|
#region Private Fields
|
||||||
|
|
||||||
|
private string _iniPath = @"C:\temp\DATA\CONF\SIMUL_01.ini";
|
||||||
|
|
||||||
|
private string baseDir = @"c:\temp\IobConf";
|
||||||
|
|
||||||
|
private string CodIOB = "NewIOB_00";
|
||||||
|
|
||||||
|
private string rawFileContent = "";
|
||||||
|
|
||||||
|
#endregion Private Fields
|
||||||
|
|
||||||
#region Private Methods
|
#region Private Methods
|
||||||
|
|
||||||
private void checkOutDir()
|
private void checkOutDir()
|
||||||
@@ -93,6 +107,13 @@ namespace IobConf.UI.Components
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void updateConf()
|
||||||
|
{
|
||||||
|
// aggiorno conf JSON/YAML
|
||||||
|
confJson = getMarkup(CurrentConf.GetJson());
|
||||||
|
confYaml = getMarkup(CurrentConf.GetYaml());
|
||||||
|
}
|
||||||
|
|
||||||
#endregion Private Methods
|
#endregion Private Methods
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,17 +1,21 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01.pubxml" />
|
<_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01.pubxml" />
|
||||||
<_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02.pubxml" />
|
<_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS03.pubxml" />
|
||||||
<_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS04.pubxml" />
|
<_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS04.pubxml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="NLog.Web.AspNetCore" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\IobConf.Core\IobConf.Core.csproj" />
|
<ProjectReference Include="..\IobConf.Core\IobConf.Core.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
|
|
||||||
autoReload="true"
|
|
||||||
throwExceptions="false"
|
|
||||||
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
|
|
||||||
|
|
||||||
<variable name="logDir" value="${basedir}/logs"/>
|
|
||||||
<targets>
|
|
||||||
<target xsi:type="File"
|
|
||||||
name="f_base"
|
|
||||||
fileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.log"
|
|
||||||
layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}"
|
|
||||||
archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.{###}.log"
|
|
||||||
archiveNumbering="Sequence"
|
|
||||||
archiveAboveSize="10240000"
|
|
||||||
maxArchiveFiles="90"
|
|
||||||
enableArchiveFileCompression="false"
|
|
||||||
keepFileOpen="false"
|
|
||||||
/>
|
|
||||||
<target xsi:type="File"
|
|
||||||
name="f_error"
|
|
||||||
fileName="${logDir}/${var:codIOB:default=0000}/${shortdate}_err.log"
|
|
||||||
layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}${newline}${exception:format=tostring}"
|
|
||||||
archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}_err.{###}.log"
|
|
||||||
archiveNumbering="Sequence"
|
|
||||||
archiveAboveSize="10240000"
|
|
||||||
maxArchiveFiles="90"
|
|
||||||
enableArchiveFileCompression="false"
|
|
||||||
keepFileOpen="false"
|
|
||||||
/>
|
|
||||||
</targets>
|
|
||||||
<rules>
|
|
||||||
<!-- Logging Levels (Trace, Debug, Info, Warn, Error, Fatal)-->
|
|
||||||
<logger name="*" minlevel="Trace" maxlevel="Warn" final="true" writeTo="f_base" />
|
|
||||||
<logger name="*" minlevel="Error" writeTo="f_error" />
|
|
||||||
</rules>
|
|
||||||
</nlog>
|
|
||||||
@@ -19,10 +19,5 @@ namespace IobConf.UI.Pages
|
|||||||
{
|
{
|
||||||
public partial class Converter
|
public partial class Converter
|
||||||
{
|
{
|
||||||
private int currentCount = 0;
|
|
||||||
private void IncrementCount()
|
|
||||||
{
|
|
||||||
currentCount++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,16 @@
|
|||||||
using IobConf.UI.Data;
|
using IobConf.UI.Data;
|
||||||
using Microsoft.AspNetCore.Components;
|
using Microsoft.AspNetCore.Components;
|
||||||
using Microsoft.AspNetCore.Components.Web;
|
using Microsoft.AspNetCore.Components.Web;
|
||||||
|
using NLog;
|
||||||
|
using NLog.Web;
|
||||||
|
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
|
|
||||||
|
var logger = LogManager.Setup()
|
||||||
|
.LoadConfigurationFromAppSettings()
|
||||||
|
.GetCurrentClassLogger();
|
||||||
|
logger.Info("Program.cs: startup");
|
||||||
|
|
||||||
// Add services to the container.
|
// Add services to the container.
|
||||||
builder.Services.AddRazorPages();
|
builder.Services.AddRazorPages();
|
||||||
builder.Services.AddServerSideBlazor();
|
builder.Services.AddServerSideBlazor();
|
||||||
@@ -28,4 +35,5 @@ app.UseRouting();
|
|||||||
app.MapBlazorHub();
|
app.MapBlazorHub();
|
||||||
app.MapFallbackToPage("/_Host");
|
app.MapFallbackToPage("/_Host");
|
||||||
|
|
||||||
|
logger.Info("Run App");
|
||||||
app.Run();
|
app.Run();
|
||||||
|
|||||||
@@ -22,6 +22,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||||||
<UserName>jenkins</UserName>
|
<UserName>jenkins</UserName>
|
||||||
<_SavePWD>true</_SavePWD>
|
<_SavePWD>true</_SavePWD>
|
||||||
<_TargetId>IISWebDeploy</_TargetId>
|
<_TargetId>IISWebDeploy</_TargetId>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
https://go.microsoft.com/fwlink/?LinkID=208121.
|
|
||||||
-->
|
|
||||||
<Project>
|
|
||||||
<PropertyGroup>
|
|
||||||
<WebPublishMethod>MSDeploy</WebPublishMethod>
|
|
||||||
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
|
|
||||||
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
|
|
||||||
<LastUsedPlatform>Any CPU</LastUsedPlatform>
|
|
||||||
<SiteUrlToLaunchAfterPublish>https://iis02.egalware.com/MP/CONF</SiteUrlToLaunchAfterPublish>
|
|
||||||
<ExcludeApp_Data>false</ExcludeApp_Data>
|
|
||||||
<ProjectGuid>c2109e71-4eae-4167-9052-175123ccc2bc</ProjectGuid>
|
|
||||||
<SelfContained>false</SelfContained>
|
|
||||||
<MSDeployServiceURL>https://iis02.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
|
|
||||||
<DeployIisAppPath>Default Web Site/MP/CONF</DeployIisAppPath>
|
|
||||||
<RemoteSitePhysicalPath />
|
|
||||||
<SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
|
|
||||||
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
|
|
||||||
<EnableMSDeployBackup>true</EnableMSDeployBackup>
|
|
||||||
<EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
|
|
||||||
<UserName>jenkins</UserName>
|
|
||||||
<_SavePWD>true</_SavePWD>
|
|
||||||
<_TargetId>IISWebDeploy</_TargetId>
|
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
https://go.microsoft.com/fwlink/?LinkID=208121.
|
||||||
|
-->
|
||||||
|
<Project>
|
||||||
|
<PropertyGroup>
|
||||||
|
<WebPublishMethod>MSDeploy</WebPublishMethod>
|
||||||
|
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
|
||||||
|
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
|
||||||
|
<LastUsedPlatform>Any CPU</LastUsedPlatform>
|
||||||
|
<SiteUrlToLaunchAfterPublish>https://iis03.egalware.com/MP/CONF</SiteUrlToLaunchAfterPublish>
|
||||||
|
<ExcludeApp_Data>false</ExcludeApp_Data>
|
||||||
|
<ProjectGuid>c2109e71-4eae-4167-9052-175123ccc2bc</ProjectGuid>
|
||||||
|
<SelfContained>false</SelfContained>
|
||||||
|
<MSDeployServiceURL>https://iis03.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
|
||||||
|
<DeployIisAppPath>Default Web Site/MP/CONF</DeployIisAppPath>
|
||||||
|
<RemoteSitePhysicalPath />
|
||||||
|
<SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
|
||||||
|
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
|
||||||
|
<EnableMSDeployBackup>true</EnableMSDeployBackup>
|
||||||
|
<EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
|
||||||
|
<UserName>jenkins</UserName>
|
||||||
|
<_SavePWD>true</_SavePWD>
|
||||||
|
<_TargetId>IISWebDeploy</_TargetId>
|
||||||
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
https://go.microsoft.com/fwlink/?LinkID=208121.
|
||||||
|
-->
|
||||||
|
<Project>
|
||||||
|
<PropertyGroup>
|
||||||
|
<WebPublishMethod>MSDeploy</WebPublishMethod>
|
||||||
|
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
|
||||||
|
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
|
||||||
|
<LastUsedPlatform>Any CPU</LastUsedPlatform>
|
||||||
|
<SiteUrlToLaunchAfterPublish>https://iis03.egalware.com/MP/CONF</SiteUrlToLaunchAfterPublish>
|
||||||
|
<ExcludeApp_Data>false</ExcludeApp_Data>
|
||||||
|
<ProjectGuid>c2109e71-4eae-4167-9052-175123ccc2bc</ProjectGuid>
|
||||||
|
<SelfContained>false</SelfContained>
|
||||||
|
<MSDeployServiceURL>https://iis03.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
|
||||||
|
<DeployIisAppPath>Default Web Site/MP/CONF</DeployIisAppPath>
|
||||||
|
<RemoteSitePhysicalPath />
|
||||||
|
<SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
|
||||||
|
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
|
||||||
|
<EnableMSDeployBackup>true</EnableMSDeployBackup>
|
||||||
|
<EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
|
||||||
|
<UserName>jenkins</UserName>
|
||||||
|
<_SavePWD>true</_SavePWD>
|
||||||
|
<_TargetId>IISWebDeploy</_TargetId>
|
||||||
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
@@ -5,5 +5,48 @@
|
|||||||
"Microsoft.AspNetCore": "Warning"
|
"Microsoft.AspNetCore": "Warning"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"AllowedHosts": "*"
|
"AllowedHosts": "*",
|
||||||
|
"NLog": {
|
||||||
|
"variables": {
|
||||||
|
"baseFileDir": "${basedir}/logs/",
|
||||||
|
"layout": "${longdate} | ${uppercase:${level}} | ${logger:shortName=false} | ${message}"
|
||||||
|
},
|
||||||
|
// "internalLogLevel": "Info",
|
||||||
|
// "internalLogFile": "c:\\temp\\internal-nlog.txt",
|
||||||
|
"extensions": [
|
||||||
|
{ "assembly": "NLog.Extensions.Logging" },
|
||||||
|
{ "assembly": "NLog.Web.AspNetCore" }
|
||||||
|
],
|
||||||
|
"throwConfigExceptions": true,
|
||||||
|
"targets": {
|
||||||
|
"async": true,
|
||||||
|
"logfile": {
|
||||||
|
"type": "File",
|
||||||
|
"fileName": "${basedir}/logs/${shortdate}.log",
|
||||||
|
"archiveEvery": "Day",
|
||||||
|
"archiveFileName": "${basedir}/logs/old/${shortdate}_{#}.log",
|
||||||
|
"archiveNumbering": "DateAndSequence",
|
||||||
|
"archiveAboveSize": "1024000",
|
||||||
|
"archiveDateFormat": "HH",
|
||||||
|
"maxArchiveFiles": "60",
|
||||||
|
"maxArchiveDays": "30"
|
||||||
|
},
|
||||||
|
"logconsole": {
|
||||||
|
"type": "ColoredConsole",
|
||||||
|
"layout": "${longdate} | ${uppercase:${level}} | ${logger:shortName=true} | ${message}"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"logger": "*",
|
||||||
|
"minLevel": "Trace",
|
||||||
|
"writeTo": "logconsole"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"logger": "*",
|
||||||
|
"minLevel": "Info",
|
||||||
|
"writeTo": "logfile"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+12
@@ -14,6 +14,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.INVE", "MP.INVE\MP.INVE.
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Egw.Core", "Egw.Core\Egw.Core.csproj", "{84B1B205-AAC2-451C-914E-992CE8BA5B58}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Egw.Core", "Egw.Core\Egw.Core.csproj", "{84B1B205-AAC2-451C-914E-992CE8BA5B58}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{F26867FD-E419-41C5-9AAE-29F40C050EB5}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{5728AB68-0D7A-49B7-904A-987AC81B5D69}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -32,6 +36,14 @@ Global
|
|||||||
{84B1B205-AAC2-451C-914E-992CE8BA5B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{84B1B205-AAC2-451C-914E-992CE8BA5B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{84B1B205-AAC2-451C-914E-992CE8BA5B58}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{84B1B205-AAC2-451C-914E-992CE8BA5B58}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{84B1B205-AAC2-451C-914E-992CE8BA5B58}.Release|Any CPU.Build.0 = Release|Any CPU
|
{84B1B205-AAC2-451C-914E-992CE8BA5B58}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{F26867FD-E419-41C5-9AAE-29F40C050EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{F26867FD-E419-41C5-9AAE-29F40C050EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{F26867FD-E419-41C5-9AAE-29F40C050EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{F26867FD-E419-41C5-9AAE-29F40C050EB5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{5728AB68-0D7A-49B7-904A-987AC81B5D69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{5728AB68-0D7A-49B7-904A-987AC81B5D69}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{5728AB68-0D7A-49B7-904A-987AC81B5D69}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{5728AB68-0D7A-49B7-904A-987AC81B5D69}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
+16
-2
@@ -1,12 +1,18 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 17
|
# Visual Studio Version 18
|
||||||
VisualStudioVersion = 17.4.33205.214
|
VisualStudioVersion = 18.4.11620.152
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{A0C7A1E7-6E5F-41BA-8ED0-C4A6C581C1B3}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{A0C7A1E7-6E5F-41BA-8ED0-C4A6C581C1B3}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.IOC", "MP.IOC\MP.IOC.csproj", "{B9F508BF-8503-4C25-B9BA-0FAC411C44C5}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.IOC", "MP.IOC\MP.IOC.csproj", "{B9F508BF-8503-4C25-B9BA-0FAC411C44C5}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{7D32419E-3C7C-48F7-B9CA-DB86CDBDBE95}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{DA5DA9DD-ED47-47F9-930F-EA423E9D9DD9}"
|
||||||
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{331E8AB2-F712-4F91-8D72-F8A90AA9FFC2}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -21,6 +27,14 @@ Global
|
|||||||
{B9F508BF-8503-4C25-B9BA-0FAC411C44C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{B9F508BF-8503-4C25-B9BA-0FAC411C44C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{B9F508BF-8503-4C25-B9BA-0FAC411C44C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{B9F508BF-8503-4C25-B9BA-0FAC411C44C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{B9F508BF-8503-4C25-B9BA-0FAC411C44C5}.Release|Any CPU.Build.0 = Release|Any CPU
|
{B9F508BF-8503-4C25-B9BA-0FAC411C44C5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{7D32419E-3C7C-48F7-B9CA-DB86CDBDBE95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{7D32419E-3C7C-48F7-B9CA-DB86CDBDBE95}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{7D32419E-3C7C-48F7-B9CA-DB86CDBDBE95}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{7D32419E-3C7C-48F7-B9CA-DB86CDBDBE95}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{DA5DA9DD-ED47-47F9-930F-EA423E9D9DD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{DA5DA9DD-ED47-47F9-930F-EA423E9D9DD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{DA5DA9DD-ED47-47F9-930F-EA423E9D9DD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{DA5DA9DD-ED47-47F9-930F-EA423E9D9DD9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
+31
@@ -9,24 +9,55 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.AppAuth", "MP.AppAuth\MP
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Egw.Core", "Egw.Core\Egw.Core.csproj", "{D3D348EF-1313-43DF-94FB-28CD38B68212}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Egw.Core", "Egw.Core\Egw.Core.csproj", "{D3D348EF-1313-43DF-94FB-28CD38B68212}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{EE871AE5-9B5E-493E-8E59-F77234979AD7}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{8BBD39D5-9390-4EBA-979B-954DC8FFC850}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{DE935A48-5E0F-4AD4-953F-8820565BF616}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug_LiManDebug|Any CPU = Debug_LiManDebug|Any CPU
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{D949AB45-9B65-4594-A97E-182BC3831707}.Debug_LiManDebug|Any CPU.ActiveCfg = Debug_LiManDebug|Any CPU
|
||||||
|
{D949AB45-9B65-4594-A97E-182BC3831707}.Debug_LiManDebug|Any CPU.Build.0 = Debug_LiManDebug|Any CPU
|
||||||
{D949AB45-9B65-4594-A97E-182BC3831707}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{D949AB45-9B65-4594-A97E-182BC3831707}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{D949AB45-9B65-4594-A97E-182BC3831707}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{D949AB45-9B65-4594-A97E-182BC3831707}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{D949AB45-9B65-4594-A97E-182BC3831707}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{D949AB45-9B65-4594-A97E-182BC3831707}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{D949AB45-9B65-4594-A97E-182BC3831707}.Release|Any CPU.Build.0 = Release|Any CPU
|
{D949AB45-9B65-4594-A97E-182BC3831707}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}.Debug_LiManDebug|Any CPU.ActiveCfg = Debug_LiManDebug|Any CPU
|
||||||
|
{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}.Debug_LiManDebug|Any CPU.Build.0 = Debug_LiManDebug|Any CPU
|
||||||
{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}.Release|Any CPU.Build.0 = Release|Any CPU
|
{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{D3D348EF-1313-43DF-94FB-28CD38B68212}.Debug_LiManDebug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{D3D348EF-1313-43DF-94FB-28CD38B68212}.Debug_LiManDebug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{D3D348EF-1313-43DF-94FB-28CD38B68212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{D3D348EF-1313-43DF-94FB-28CD38B68212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{D3D348EF-1313-43DF-94FB-28CD38B68212}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{D3D348EF-1313-43DF-94FB-28CD38B68212}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{D3D348EF-1313-43DF-94FB-28CD38B68212}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{D3D348EF-1313-43DF-94FB-28CD38B68212}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{D3D348EF-1313-43DF-94FB-28CD38B68212}.Release|Any CPU.Build.0 = Release|Any CPU
|
{D3D348EF-1313-43DF-94FB-28CD38B68212}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{EE871AE5-9B5E-493E-8E59-F77234979AD7}.Debug_LiManDebug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{EE871AE5-9B5E-493E-8E59-F77234979AD7}.Debug_LiManDebug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{EE871AE5-9B5E-493E-8E59-F77234979AD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{EE871AE5-9B5E-493E-8E59-F77234979AD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{EE871AE5-9B5E-493E-8E59-F77234979AD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{EE871AE5-9B5E-493E-8E59-F77234979AD7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{8BBD39D5-9390-4EBA-979B-954DC8FFC850}.Debug_LiManDebug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{8BBD39D5-9390-4EBA-979B-954DC8FFC850}.Debug_LiManDebug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{8BBD39D5-9390-4EBA-979B-954DC8FFC850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{8BBD39D5-9390-4EBA-979B-954DC8FFC850}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{8BBD39D5-9390-4EBA-979B-954DC8FFC850}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{8BBD39D5-9390-4EBA-979B-954DC8FFC850}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{DE935A48-5E0F-4AD4-953F-8820565BF616}.Debug_LiManDebug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{DE935A48-5E0F-4AD4-953F-8820565BF616}.Debug_LiManDebug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{DE935A48-5E0F-4AD4-953F-8820565BF616}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{DE935A48-5E0F-4AD4-953F-8820565BF616}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{DE935A48-5E0F-4AD4-953F-8820565BF616}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{DE935A48-5E0F-4AD4-953F-8820565BF616}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
+23
-5
@@ -5,7 +5,13 @@ VisualStudioVersion = 17.0.32126.317
|
|||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Mon", "MP.Mon\MP.Mon.csproj", "{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.MON", "MP.MON\MP.MON.csproj", "{82FD7CF4-42A2-499C-88FC-46502D166F70}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{4F652F76-AC46-444D-B808-40102F2F05C0}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{3447D4AF-13C2-47BB-8C5F-74299A46D063}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.MON.Client", "MP.MON.Client\MP.MON.Client.csproj", "{7038E415-3F9B-A8C6-C92F-32185AD31DBC}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@@ -17,10 +23,22 @@ Global
|
|||||||
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.Build.0 = Release|Any CPU
|
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{82FD7CF4-42A2-499C-88FC-46502D166F70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{82FD7CF4-42A2-499C-88FC-46502D166F70}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{82FD7CF4-42A2-499C-88FC-46502D166F70}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{7780FA7A-3597-4098-81C1-DC9AD6AE7A98}.Release|Any CPU.Build.0 = Release|Any CPU
|
{82FD7CF4-42A2-499C-88FC-46502D166F70}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{4F652F76-AC46-444D-B808-40102F2F05C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{4F652F76-AC46-444D-B808-40102F2F05C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{4F652F76-AC46-444D-B808-40102F2F05C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{4F652F76-AC46-444D-B808-40102F2F05C0}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{3447D4AF-13C2-47BB-8C5F-74299A46D063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{3447D4AF-13C2-47BB-8C5F-74299A46D063}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{3447D4AF-13C2-47BB-8C5F-74299A46D063}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{3447D4AF-13C2-47BB-8C5F-74299A46D063}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{7038E415-3F9B-A8C6-C92F-32185AD31DBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{7038E415-3F9B-A8C6-C92F-32185AD31DBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{7038E415-3F9B-A8C6-C92F-32185AD31DBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{7038E415-3F9B-A8C6-C92F-32185AD31DBC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
+14
-2
@@ -1,12 +1,16 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 16
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 16.0.31229.75
|
VisualStudioVersion = 17.11.35327.3
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Prog", "MP.Prog\MP.Prog.csproj", "{3223DDE4-564E-4D58-8A94-E368B9778C67}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Prog", "MP.Prog\MP.Prog.csproj", "{3223DDE4-564E-4D58-8A94-E368B9778C67}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.FileData", "MP.FileData\MP.FileData.csproj", "{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.FileData", "MP.FileData\MP.FileData.csproj", "{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{EF0CF5FC-2451-4184-AAA4-B17236DEE41B}"
|
||||||
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Egw.Core", "Egw.Core\Egw.Core.csproj", "{3EE72B27-C44F-40F5-B4E8-E43ECA6F39B1}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -21,6 +25,14 @@ Global
|
|||||||
{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}.Release|Any CPU.Build.0 = Release|Any CPU
|
{48693321-1FA6-4DBB-A730-B8EF3E0B68D2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{EF0CF5FC-2451-4184-AAA4-B17236DEE41B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{EF0CF5FC-2451-4184-AAA4-B17236DEE41B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{EF0CF5FC-2451-4184-AAA4-B17236DEE41B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{EF0CF5FC-2451-4184-AAA4-B17236DEE41B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{3EE72B27-C44F-40F5-B4E8-E43ECA6F39B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{3EE72B27-C44F-40F5-B4E8-E43ECA6F39B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{3EE72B27-C44F-40F5-B4E8-E43ECA6F39B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{3EE72B27-C44F-40F5-B4E8-E43ECA6F39B1}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
+37
@@ -0,0 +1,37 @@
|
|||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio Version 18
|
||||||
|
VisualStudioVersion = 18.5.11723.231 stable
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.RIOC", "MP.RIOC\MP.RIOC.csproj", "{89885A8B-EB0E-814D-11D5-0B19D3E0B45F}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{9F25E500-62F6-E0D9-D94E-E8DF589C4F97}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Data", "MP.Data\MP.Data.csproj", "{327FAC24-FF59-3DEF-C9BA-574CE61AE1E5}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{89885A8B-EB0E-814D-11D5-0B19D3E0B45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{89885A8B-EB0E-814D-11D5-0B19D3E0B45F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{89885A8B-EB0E-814D-11D5-0B19D3E0B45F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{89885A8B-EB0E-814D-11D5-0B19D3E0B45F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{9F25E500-62F6-E0D9-D94E-E8DF589C4F97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{9F25E500-62F6-E0D9-D94E-E8DF589C4F97}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{9F25E500-62F6-E0D9-D94E-E8DF589C4F97}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{9F25E500-62F6-E0D9-D94E-E8DF589C4F97}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{327FAC24-FF59-3DEF-C9BA-574CE61AE1E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{327FAC24-FF59-3DEF-C9BA-574CE61AE1E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{327FAC24-FF59-3DEF-C9BA-574CE61AE1E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{327FAC24-FF59-3DEF-C9BA-574CE61AE1E5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
|
SolutionGuid = {AEB0B74D-1A03-4D0C-B6B0-8928D097A975}
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
<Solution>
|
||||||
|
<Project Path="MP.Core/MP.Core.csproj" />
|
||||||
|
<Project Path="MP.Data/MP.Data.csproj" />
|
||||||
|
<Project Path="MP.RIOC/MP.RIOC.csproj" />
|
||||||
|
</Solution>
|
||||||
+26
-2
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 17
|
# Visual Studio Version 18
|
||||||
VisualStudioVersion = 17.0.32126.317
|
VisualStudioVersion = 18.3.11520.95
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}"
|
||||||
EndProject
|
EndProject
|
||||||
@@ -12,6 +12,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
|
|||||||
.editorconfig = .editorconfig
|
.editorconfig = .editorconfig
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{15231E76-5A27-4D4E-982C-17A886A9EEB8}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{1887A0C0-679E-4535-90D4-60DAA428D019}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.AppAuth", "MP.AppAuth\MP.AppAuth.csproj", "{5D73F0E2-7D1E-09BA-DB9D-EEC7A88766EE}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Egw.Core", "Egw.Core\Egw.Core.csproj", "{A46276E0-9BFD-EABB-C49C-9B42ED4CA5CA}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -26,6 +34,22 @@ Global
|
|||||||
{C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Release|Any CPU.Build.0 = Release|Any CPU
|
{C777A098-6F91-45AF-A85E-0AD08CBCAC52}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{15231E76-5A27-4D4E-982C-17A886A9EEB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{15231E76-5A27-4D4E-982C-17A886A9EEB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{15231E76-5A27-4D4E-982C-17A886A9EEB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{15231E76-5A27-4D4E-982C-17A886A9EEB8}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{1887A0C0-679E-4535-90D4-60DAA428D019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{1887A0C0-679E-4535-90D4-60DAA428D019}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{1887A0C0-679E-4535-90D4-60DAA428D019}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{1887A0C0-679E-4535-90D4-60DAA428D019}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{5D73F0E2-7D1E-09BA-DB9D-EEC7A88766EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{5D73F0E2-7D1E-09BA-DB9D-EEC7A88766EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{5D73F0E2-7D1E-09BA-DB9D-EEC7A88766EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{5D73F0E2-7D1E-09BA-DB9D-EEC7A88766EE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{A46276E0-9BFD-EABB-C49C-9B42ED4CA5CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{A46276E0-9BFD-EABB-C49C-9B42ED4CA5CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{A46276E0-9BFD-EABB-C49C-9B42ED4CA5CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{A46276E0-9BFD-EABB-C49C-9B42ED4CA5CA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
+20
-2
@@ -1,12 +1,18 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 17
|
# Visual Studio Version 18
|
||||||
VisualStudioVersion = 17.0.32126.317
|
VisualStudioVersion = 18.5.11723.231 stable
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Stats", "MP.Stats\MP.Stats.csproj", "{D9901B50-E61C-400C-B62C-FA060CF72C29}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Stats", "MP.Stats\MP.Stats.csproj", "{D9901B50-E61C-400C-B62C-FA060CF72C29}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.TaskMan", "MP.TaskMan\MP.TaskMan.csproj", "{D334DE4B-1F54-4F30-899B-9ECB79C9F527}"
|
||||||
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Egw.Core", "Egw.Core\Egw.Core.csproj", "{BC94E319-A622-497C-BEE1-BB3D77170A6D}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.Core", "MP.Core\MP.Core.csproj", "{3E74B94B-82B6-434B-AADA-875845ED193B}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -21,6 +27,18 @@ Global
|
|||||||
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.Build.0 = Release|Any CPU
|
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{D334DE4B-1F54-4F30-899B-9ECB79C9F527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{D334DE4B-1F54-4F30-899B-9ECB79C9F527}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{D334DE4B-1F54-4F30-899B-9ECB79C9F527}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{D334DE4B-1F54-4F30-899B-9ECB79C9F527}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{BC94E319-A622-497C-BEE1-BB3D77170A6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{BC94E319-A622-497C-BEE1-BB3D77170A6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{BC94E319-A622-497C-BEE1-BB3D77170A6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{BC94E319-A622-497C-BEE1-BB3D77170A6D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{3E74B94B-82B6-434B-AADA-875845ED193B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{3E74B94B-82B6-434B-AADA-875845ED193B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{3E74B94B-82B6-434B-AADA-875845ED193B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{3E74B94B-82B6-434B-AADA-875845ED193B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
-37
@@ -1,37 +0,0 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
|
||||||
# Visual Studio Version 17
|
|
||||||
VisualStudioVersion = 17.0.32126.317
|
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Data", "MP.Data\MP.Data.csproj", "{10BA8450-301D-49C7-8E1E-21B7469C225C}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP-TAB", "MP-TAB\MP-TAB\MP-TAB.csproj", "{9141D627-EE10-4BF6-9A2C-AAC6845E185F}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP-TAB.Client", "MP-TAB\MP-TAB.Client\MP-TAB.Client.csproj", "{28559808-58F2-424B-B65C-062AA59839EC}"
|
|
||||||
EndProject
|
|
||||||
Global
|
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
||||||
Debug|Any CPU = Debug|Any CPU
|
|
||||||
Release|Any CPU = Release|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
||||||
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{10BA8450-301D-49C7-8E1E-21B7469C225C}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{9141D627-EE10-4BF6-9A2C-AAC6845E185F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{9141D627-EE10-4BF6-9A2C-AAC6845E185F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{9141D627-EE10-4BF6-9A2C-AAC6845E185F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{9141D627-EE10-4BF6-9A2C-AAC6845E185F}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{28559808-58F2-424B-B65C-062AA59839EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{28559808-58F2-424B-B65C-062AA59839EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{28559808-58F2-424B-B65C-062AA59839EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{28559808-58F2-424B-B65C-062AA59839EC}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
|
||||||
SolutionGuid = {632D11D1-088B-4795-97E5-048534002558}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
<div class="card shadow" style="width: 22rem">
|
|
||||||
<div class="card-header @CardCss">
|
|
||||||
<h3 class="card-title">
|
|
||||||
@if (DoPlaceholder)
|
|
||||||
{
|
|
||||||
<div class="placeholder-glow">
|
|
||||||
<span class="placeholder col-6"></span>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@Title
|
|
||||||
}
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
<div class="card-body">
|
|
||||||
@if (DoPlaceholder)
|
|
||||||
{
|
|
||||||
<div class="placeholder-glow">
|
|
||||||
<span class="placeholder col-7"></span>
|
|
||||||
<span class="placeholder col-4"></span>
|
|
||||||
<span class="placeholder col-4"></span>
|
|
||||||
<span class="placeholder col-7"></span>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<p class="card-text">@ChildContent</p>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
<div class="card-footer">
|
|
||||||
@if (DoPlaceholder)
|
|
||||||
{
|
|
||||||
<div class="placeholder-glow">
|
|
||||||
<button class="btn btn-sm btn-dark disabled placeholder col-2"></button>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<button class="btn btn-sm btn-dark" @onclick="OnYes">Yes!</button>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
[Parameter]
|
|
||||||
public RenderFragment? ChildContent { get; set; }
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public string? Title { get; set; }
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public string CardCss { get; set; } = "";
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public bool DoPlaceholder { get; set; } = false;
|
|
||||||
|
|
||||||
private void OnYes()
|
|
||||||
{
|
|
||||||
Console.WriteLine($"{Title} | 'Yes' button selected.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,233 +0,0 @@
|
|||||||
@if (RecMSE == null)
|
|
||||||
{
|
|
||||||
<div class="card text-white mapBlock shadow bg-secondary p-0 m-0">
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="placeholder-glow">
|
|
||||||
<span class="placeholder col-7"></span>
|
|
||||||
<span class="placeholder col-4"></span>
|
|
||||||
<span class="placeholder col-4"></span>
|
|
||||||
<span class="placeholder col-7"></span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@if (FullMode)
|
|
||||||
{
|
|
||||||
<div class="card mapBlock shadow @RecMSE.Semaforo p-0 m-0" @onclick="ShowDetail">
|
|
||||||
<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top" alt="@RecMSE.CodMacchina">
|
|
||||||
<div class="m-1 bg-black">
|
|
||||||
<div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start rCTop">
|
|
||||||
<div class="labelTopDx px-2 w-100">
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-3 text-start">
|
|
||||||
Art
|
|
||||||
</div>
|
|
||||||
<div class="col-9 text-end fw-bold">
|
|
||||||
@RecMSE.CodArticolo
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row small">
|
|
||||||
<div class="col-6 text-start">
|
|
||||||
@($"PODL{RecMSE.IdxPOdl:00000000}")
|
|
||||||
</div>
|
|
||||||
<div class="col-6 text-end">
|
|
||||||
@($"ODL{RecMSE.IdxOdl:00000000}")
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="card bg-black text-light p-0 rCBot">
|
|
||||||
<div class="row justify-content-center mx-0">
|
|
||||||
<div class="col-12 px-1">
|
|
||||||
<h4 class="text-start mb-0 fw-bold">
|
|
||||||
@RecMSE.Nome
|
|
||||||
</h4>
|
|
||||||
</div>
|
|
||||||
<div class="col-12 p-1 @RecMSE.Semaforo">
|
|
||||||
<div class="d-flex justify-content-between">
|
|
||||||
<div class="p-0 mr-auto">
|
|
||||||
<b>@RecMSE.DescrizioneStato</b>
|
|
||||||
</div>
|
|
||||||
<div class="p-0">
|
|
||||||
@(formatDurata(RecMSE.Durata))
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-12 p-0 text-nowrap" style="font-size: 1.2em; line-height: 1.0em;">
|
|
||||||
<div class="row px-1 fw-bold" style="font-size:0.85em;">
|
|
||||||
<div class="col pe-0">
|
|
||||||
<small class="text-success">Confermati</small>
|
|
||||||
</div>
|
|
||||||
<div class="col text-center px-0">
|
|
||||||
<small class="text-warning">Prodotti</small>
|
|
||||||
</div>
|
|
||||||
<div class="col text-end ps-0">
|
|
||||||
<small class="text-light">Ordinati</small>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row px-1">
|
|
||||||
<div class="col pe-0 text-success">
|
|
||||||
@($"{RecMSE.PezziConf:N0}")
|
|
||||||
</div>
|
|
||||||
<div class="col text-center text-warning px-0">
|
|
||||||
@($"{RecMSE.PezziProd:N0}")
|
|
||||||
</div>
|
|
||||||
<div class="col text-end ps-0">
|
|
||||||
@($"{RecMSE.NumPezzi:N0}")
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col m-1">
|
|
||||||
<ProdAdvDispl CountData="@CurrCount"></ProdAdvDispl>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public MappaStatoExpl? RecMSE { get; set; } = null;
|
|
||||||
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public int keepAliveMin { get; set; } = 5;
|
|
||||||
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public bool FullMode { get; set; } = true;
|
|
||||||
|
|
||||||
[Inject]
|
|
||||||
protected NavigationManager NavMan { get; set; } = null!;
|
|
||||||
|
|
||||||
|
|
||||||
protected int kaFactor = 60 / 2;
|
|
||||||
|
|
||||||
protected override void OnInitialized()
|
|
||||||
{
|
|
||||||
// se configurata uso cartella virtuale... altrimenti cartella processo
|
|
||||||
imgBasePath = Environment.CurrentDirectory;// @"C:\Steamware\macchine";
|
|
||||||
}
|
|
||||||
|
|
||||||
private string imgBasePath = "";
|
|
||||||
|
|
||||||
protected ProdAdvDispl.ProdCounter CurrCount
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
ProdAdvDispl.ProdCounter answ = new ProdAdvDispl.ProdCounter()
|
|
||||||
{
|
|
||||||
numPzConf = (int)RecMSE.PezziConf,
|
|
||||||
numPzOrd= (int)RecMSE.NumPezzi,
|
|
||||||
numPzProd= (int)RecMSE.PezziProd
|
|
||||||
};
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected async Task ShowDetail()
|
|
||||||
{
|
|
||||||
NavMan.NavigateTo($"machine-detail/?IdxMacc={RecMSE!.IdxMacchina}");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// url completo immagine
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="url"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public string ImgUrlMacc(string url)
|
|
||||||
{
|
|
||||||
string answ = "";
|
|
||||||
if (string.IsNullOrEmpty(url.ToString()))
|
|
||||||
{
|
|
||||||
url = "Steamware.png";
|
|
||||||
}
|
|
||||||
// verifico esistenza macchina SMALL...
|
|
||||||
answ = $"images/macchine/small/{url}";
|
|
||||||
string fullPath = Path.Combine(imgBasePath, "wwwroot", answ);
|
|
||||||
if (!File.Exists(fullPath))
|
|
||||||
{
|
|
||||||
// se non ci fosse cerco immagine fullsize
|
|
||||||
answ = $"images/macchine/{url}";
|
|
||||||
fullPath = Path.Combine(imgBasePath, "wwwroot", answ);
|
|
||||||
}
|
|
||||||
// altrimenti metto default Steamware
|
|
||||||
if (!File.Exists(fullPath))
|
|
||||||
{
|
|
||||||
answ = "images/macchine/Steamware.png";
|
|
||||||
}
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// formatta la durata in minuti in un modo "human readable" gg/ore/min
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="minuti">minuti</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static string formatDurata(double? minuti)
|
|
||||||
{
|
|
||||||
string answ = "??";
|
|
||||||
if (minuti != null)
|
|
||||||
{
|
|
||||||
DateTime tempo = new DateTime();
|
|
||||||
tempo = tempo.AddMinutes((double)minuti);
|
|
||||||
|
|
||||||
if (minuti < 60)
|
|
||||||
{
|
|
||||||
answ = $"{tempo.Minute:00}:{tempo.Second:00}";
|
|
||||||
}
|
|
||||||
else if (minuti < 1440)
|
|
||||||
{
|
|
||||||
answ = $"{tempo.Hour}h {tempo.Minute}m";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
answ = $"{tempo.DayOfYear}g {tempo.Hour}h";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
private string cssComStatus(string semaforo, DateTime? lastUpdateN)
|
|
||||||
{
|
|
||||||
DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1);
|
|
||||||
string answ = cssStatus(semaforo);
|
|
||||||
if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > (keepAliveMin * kaFactor))
|
|
||||||
{
|
|
||||||
answ = $"{baseCss}Ro";
|
|
||||||
// blink se secondo pari...
|
|
||||||
DateTime adesso = DateTime.Now;
|
|
||||||
int resto = 0;
|
|
||||||
Math.DivRem(adesso.Second, 2, out resto);
|
|
||||||
if (resto == 0)
|
|
||||||
{
|
|
||||||
answ += "_b";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
private string cssStatus(string codSemaforo)
|
|
||||||
{
|
|
||||||
// se vuoto --> mostra nero!
|
|
||||||
if (string.IsNullOrEmpty(codSemaforo))
|
|
||||||
{
|
|
||||||
codSemaforo = "sNe";
|
|
||||||
}
|
|
||||||
string codColore = codSemaforo.Substring(1, 2);
|
|
||||||
string answ = $"{baseCss}{codColore}";
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
protected string baseCss = "sem";
|
|
||||||
}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
/* Bordi */
|
|
||||||
/*.rCAll {
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rCTop {
|
|
||||||
border-radius: 10px 10px 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rCBot {
|
|
||||||
border-radius: 0 0 10px 10px;
|
|
||||||
}*/
|
|
||||||
.mapBlock {
|
|
||||||
font-family: 'Open Sans Condensed', sans-serif;
|
|
||||||
color: #FFF;
|
|
||||||
background-image: linear-gradient(#111, #000);
|
|
||||||
min-width: 8em;
|
|
||||||
}
|
|
||||||
.labelTopDx {
|
|
||||||
padding: 0.1em 0.4em;
|
|
||||||
width: auto;
|
|
||||||
min-height: 0;
|
|
||||||
top: 0;
|
|
||||||
left: auto;
|
|
||||||
bottom: auto;
|
|
||||||
color: #FFFFFF;
|
|
||||||
background: #2200DE;
|
|
||||||
background: rgba(33, 0, 200, 0.7);
|
|
||||||
-webkit-border-top-right-radius: inherit;
|
|
||||||
border-top-right-radius: inherit;
|
|
||||||
-webkit-border-top-left-radius: inherit;
|
|
||||||
border-top-left-radius: inherit;
|
|
||||||
-webkit-border-bottom-left-radius: inherit;
|
|
||||||
border-bottom-left-radius: inherit;
|
|
||||||
-webkit-border-bottom-right-radius: 0;
|
|
||||||
border-bottom-right-radius: 0;
|
|
||||||
}
|
|
||||||
/* area semafori*/
|
|
||||||
.sVe {
|
|
||||||
text-align: left;
|
|
||||||
background: #009036;
|
|
||||||
background: rgba(0, 255, 80, 0.6);
|
|
||||||
/*padding: 0px 4px 0px 4px;*/
|
|
||||||
color: Yellow;
|
|
||||||
}
|
|
||||||
.sGi {
|
|
||||||
text-align: left;
|
|
||||||
background: #ffec00;
|
|
||||||
background: rgba(255, 220, 0, 0.6);
|
|
||||||
/*padding: 0px 4px 0px 4px;*/
|
|
||||||
}
|
|
||||||
.sRo {
|
|
||||||
text-align: left;
|
|
||||||
background-color: #e2001a;
|
|
||||||
background: rgba(240, 0, 10, 0.6);
|
|
||||||
/*padding: 0px 4px 0px 4px;*/
|
|
||||||
}
|
|
||||||
.sBl {
|
|
||||||
text-align: left;
|
|
||||||
background: #3690FF;
|
|
||||||
background: rgba(0, 80, 255, 0.6);
|
|
||||||
/*padding: 0px 4px 0px 4px;*/
|
|
||||||
color: Yellow;
|
|
||||||
}
|
|
||||||
.sGr {
|
|
||||||
text-align: left;
|
|
||||||
background-color: #bcbcbc;
|
|
||||||
background: rgba(180, 180, 180, 0.6);
|
|
||||||
/*padding: 0px 4px 0px 4px;*/
|
|
||||||
}
|
|
||||||
/*end semafori */
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/* Bordi */
|
|
||||||
/*.rCAll {
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rCTop {
|
|
||||||
border-radius: 10px 10px 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rCBot {
|
|
||||||
border-radius: 0 0 10px 10px;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
.mapBlock {
|
|
||||||
font-family: 'Open Sans Condensed', sans-serif;
|
|
||||||
color: #FFF;
|
|
||||||
background-image: linear-gradient(#111, #000);
|
|
||||||
min-width: 8em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.labelTopDx {
|
|
||||||
padding: 0.1em 0.4em;
|
|
||||||
width: auto;
|
|
||||||
min-height: 0;
|
|
||||||
top: 0;
|
|
||||||
left: auto;
|
|
||||||
bottom: auto;
|
|
||||||
color: #FFFFFF;
|
|
||||||
background: #2200DE;
|
|
||||||
background: rgba(33,0,200,.7);
|
|
||||||
-webkit-border-top-right-radius: inherit;
|
|
||||||
border-top-right-radius: inherit;
|
|
||||||
-webkit-border-top-left-radius: inherit;
|
|
||||||
border-top-left-radius: inherit;
|
|
||||||
-webkit-border-bottom-left-radius: inherit;
|
|
||||||
border-bottom-left-radius: inherit;
|
|
||||||
-webkit-border-bottom-right-radius: 0;
|
|
||||||
border-bottom-right-radius: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* area semafori*/
|
|
||||||
.sVe {
|
|
||||||
text-align: left;
|
|
||||||
background: #009036;
|
|
||||||
background: rgba(0,255,80,.6);
|
|
||||||
/*padding: 0px 4px 0px 4px;*/
|
|
||||||
color: Yellow;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sGi {
|
|
||||||
text-align: left;
|
|
||||||
background: #ffec00;
|
|
||||||
background: rgba(255,220,0,.6);
|
|
||||||
/*padding: 0px 4px 0px 4px;*/
|
|
||||||
}
|
|
||||||
|
|
||||||
.sRo {
|
|
||||||
text-align: left;
|
|
||||||
background-color: #e2001a;
|
|
||||||
background: rgba(240,0,10,.6);
|
|
||||||
/*padding: 0px 4px 0px 4px;*/
|
|
||||||
}
|
|
||||||
|
|
||||||
.sBl {
|
|
||||||
text-align: left;
|
|
||||||
background: #3690FF;
|
|
||||||
background: rgba(0,80,255,.6);
|
|
||||||
/*padding: 0px 4px 0px 4px;*/
|
|
||||||
color: Yellow;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sGr {
|
|
||||||
text-align: left;
|
|
||||||
background-color: #bcbcbc;
|
|
||||||
background: rgba(180,180,180,.6);
|
|
||||||
/*padding: 0px 4px 0px 4px;*/
|
|
||||||
}
|
|
||||||
/*end semafori */
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,0,200,.7);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.sVe{text-align:left;background:#009036;background:rgba(0,255,80,.6);color:#ff0;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#ff0;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);}
|
|
||||||
@@ -1,121 +0,0 @@
|
|||||||
<div class="progress">
|
|
||||||
<div runat="server" id="divGreen" class="progress-bar bg-success" style="width: @(NumGreen)%">
|
|
||||||
@($"{NumGreen}%")
|
|
||||||
</div>
|
|
||||||
<div runat="server" id="divYellow" class="progress-bar bg-warning text-dark" style="width: @(NumYellow)%">
|
|
||||||
@($"{NumYellow}%")
|
|
||||||
</div>
|
|
||||||
<div runat="server" id="divGray" class="progress-bar bg-secondary" style="width: @(NumGray)%">
|
|
||||||
@($"{NumGray}%")
|
|
||||||
</div>
|
|
||||||
<div runat="server" id="divBlue" class="progress-bar bg-primary" style="width: @(NumBlue)%">
|
|
||||||
@($"{NumBlue}%")
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<asp:HiddenField runat="server" ID="hfProdCount" />
|
|
||||||
|
|
||||||
@code {
|
|
||||||
/// <summary>
|
|
||||||
/// Conteggio dati produzione da mostrare
|
|
||||||
/// </summary>
|
|
||||||
[Parameter]
|
|
||||||
public ProdCounter CountData { get; set; } = null!;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Numero pezzi CONFERMATI
|
|
||||||
/// </summary>
|
|
||||||
protected int NumPzConf { get; set; } = 0;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Numero pezzi ORDINATI
|
|
||||||
/// </summary>
|
|
||||||
protected int NumPzOrd { get; set; } = 0;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Numero pezzi PRODOTTI
|
|
||||||
/// </summary>
|
|
||||||
protected int NumPzProd { get; set; } = 0;
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Numero pezzi per display BLU
|
|
||||||
/// </summary>
|
|
||||||
protected int NumBlue { get; set; } = 0;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Numero pezzi per display GRIGIO
|
|
||||||
/// </summary>
|
|
||||||
protected int NumGray { get; set; } = 40;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Numero pezzi per display VERDE
|
|
||||||
/// </summary>
|
|
||||||
protected int NumGreen { get; set; } = 20;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Numero pezzi per display GIALLO
|
|
||||||
/// </summary>
|
|
||||||
protected int NumYellow { get; set; } = 30;
|
|
||||||
|
|
||||||
protected override void OnParametersSet()
|
|
||||||
{
|
|
||||||
decimal denom = CountData.numPzProd > CountData.numPzOrd ? (decimal)CountData.numPzProd / 100 : (decimal)CountData.numPzOrd / 100;
|
|
||||||
denom = denom == 0 ? 1 : denom;
|
|
||||||
// calcolo se sono nel caso prod < ordinati o se sono andato OVER
|
|
||||||
if (CountData.numPzProd < CountData.numPzOrd)
|
|
||||||
{
|
|
||||||
nGreen = (int)Math.Floor((decimal)CountData.numPzConf / denom);
|
|
||||||
nYellow = (int)Math.Floor((decimal)(CountData.numPzProd - CountData.numPzConf) / denom);
|
|
||||||
nGray = 100 - (nGreen + nYellow);
|
|
||||||
nBlue = 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// devo verificare SE ne ho confermati meno che ordinati o meno...
|
|
||||||
if (CountData.numPzConf < CountData.numPzOrd)
|
|
||||||
{
|
|
||||||
nGreen = (int)Math.Floor((decimal)CountData.numPzConf / denom);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
nGreen = (int)Math.Floor((decimal)CountData.numPzOrd / denom);
|
|
||||||
}
|
|
||||||
nBlue = 100 - nGreen;
|
|
||||||
nYellow = 0;
|
|
||||||
nGray = 0;
|
|
||||||
}
|
|
||||||
// disegno!
|
|
||||||
NumGreen = nGreen;
|
|
||||||
NumYellow = nYellow;
|
|
||||||
NumGray = nGray;
|
|
||||||
NumBlue = nBlue;
|
|
||||||
// base.OnParametersSet();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int nBlue = 0;
|
|
||||||
protected int nGray = 0;
|
|
||||||
protected int nGreen = 0;
|
|
||||||
protected int nYellow = 0;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Classe gesitone conteggi produzione
|
|
||||||
/// </summary>
|
|
||||||
public class ProdCounter
|
|
||||||
{
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// NUmero pezzi CONFERMATI
|
|
||||||
/// </summary>
|
|
||||||
public int numPzConf { get; set; } = 0;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Numero pezzi ORDINATI
|
|
||||||
/// </summary>
|
|
||||||
public int numPzOrd { get; set; } = 0;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Numero pezzi PRODOTTI
|
|
||||||
/// </summary>
|
|
||||||
public int numPzProd { get; set; } = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
<button class="btn btn-link text-light" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasTabMenu" aria-controls="offcanvasTabMenu">
|
|
||||||
<span class="fa fa-bars fa-lg"></span>
|
|
||||||
</button>
|
|
||||||
<div class="offcanvas offcanvas-end text-start" tabindex="-1" id="offcanvasTabMenu" aria-labelledby="offcanvasTabMenuLabel">
|
|
||||||
<div class="offcanvas-header bg-secondary text-light">
|
|
||||||
<div class="d-flex flex-row">
|
|
||||||
<div class="p-0">
|
|
||||||
<img src="images/LogoSteamware.png" class="img-fluid" width="40px" />
|
|
||||||
</div>
|
|
||||||
<div class="p-0 pl-1">
|
|
||||||
<div class="flex-row">
|
|
||||||
<b class="modal-title fs-2">EgalWare</b>
|
|
||||||
</div>
|
|
||||||
<div class="flex-row">
|
|
||||||
<small>Main Menu</small>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
|
|
||||||
</div>
|
|
||||||
<div class="offcanvas-body">
|
|
||||||
<div class="d-flex flex-row">
|
|
||||||
<div class="p-2">
|
|
||||||
<b class="text-danger">LINK DIRETTI</b>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="d-flex flex-column">
|
|
||||||
<div class="list-group">
|
|
||||||
|
|
||||||
@foreach (var item in MenuItems)
|
|
||||||
{
|
|
||||||
<a class="p-2 list-group-item list-group-item-action" href="@item.NavigateUrl"><i class="fa fa-lg @item.icona pe-2"></i> @item.Testo</a>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="my-4">
|
|
||||||
<button type="button" class="btn btn-secondary w-100" data-bs-dismiss="offcanvas" aria-label="Close">Chiudi</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public List<LinkMenu> MenuItems { get; set; } = new List<LinkMenu>();
|
|
||||||
}
|
|
||||||
@@ -1,218 +0,0 @@
|
|||||||
@using MP.Data.Services;
|
|
||||||
@using NLog;
|
|
||||||
@using System.Net.Http
|
|
||||||
@using System.Net.Http.Json
|
|
||||||
@inject HttpClient Http
|
|
||||||
@inject SharedMemService MServ
|
|
||||||
@inject IConfiguration config
|
|
||||||
|
|
||||||
<div class="row small">
|
|
||||||
<div class="col-12 col-sm-6 col-xl-3 mb-2">
|
|
||||||
<div class="form-floating">
|
|
||||||
<select class="form-select form-select-sm" @bind="@IdxMaccSel" @bind:after="ReportMacc">
|
|
||||||
<option value="*" selected>-- Tutti --</option>
|
|
||||||
@if (ListMacchineAll == null)
|
|
||||||
{
|
|
||||||
<option value="" disabled>No record found</option>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@foreach (var item in ListMacchineAll)
|
|
||||||
{
|
|
||||||
<option value="@item.Key">@item.Value</option>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</select>
|
|
||||||
<label for="floatingSelect">Selezione Impianto (ODL/ART)</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-12 col-sm-6 col-xl-3 mb-2">
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-8 col-md-9 pe-0">
|
|
||||||
<div class="form-floating small">
|
|
||||||
<input type="text" class="form-control" @bind="SearchVal" @bind:after="ReloadArticoli">
|
|
||||||
<label><i class="fa-solid fa-magnifying-glass"></i> Articolo (3+ char)</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-4 col-md-3 ps-0">
|
|
||||||
<div class="form-floating small">
|
|
||||||
<input type="number" class="form-control text-end" @bind="Num2Displ">
|
|
||||||
<label># Displ</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-12 col-xl-6 mb-2">
|
|
||||||
<div class="form-floating">
|
|
||||||
<select class="form-select form-select-sm" disabled="@ListArtDisabled" @bind="@CodArtSel" @bind:after="ReportArt">
|
|
||||||
<option value="" selected>-- Nessuno --</option>
|
|
||||||
@if (ListArticoli == null)
|
|
||||||
{
|
|
||||||
<option value="" disabled>No record found</option>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@foreach (var item in ListArticoli)
|
|
||||||
{
|
|
||||||
<option value="@item.Key">@item.Value</option>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</select>
|
|
||||||
<label for="floatingSelect">Selezione Articolo (@DisplayCount / <b>@TotalCount</b>)</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public int MatrOpr { get; set; } = 102;
|
|
||||||
[Parameter]
|
|
||||||
public string Title { get; set; } = "TC History";
|
|
||||||
[Parameter]
|
|
||||||
public int SearchMinChar { get; set; }
|
|
||||||
[Parameter]
|
|
||||||
public EventCallback<string> E_CodArt { get; set; }
|
|
||||||
[Parameter]
|
|
||||||
public EventCallback<string> E_IdxMacc { get; set; }
|
|
||||||
|
|
||||||
protected string BaseAddr = "";
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
BaseAddr = config.GetValue<string>("OptConf:BaseAddr") ?? "";
|
|
||||||
await ReloadAllData();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
protected async Task ReloadAllData()
|
|
||||||
{
|
|
||||||
await ReloadArticoli();
|
|
||||||
await ReloadMacchine();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected async Task ReloadArticoli()
|
|
||||||
{
|
|
||||||
await GetArticoli();
|
|
||||||
FiltArticoli();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected async Task ReportArt()
|
|
||||||
{
|
|
||||||
await E_CodArt.InvokeAsync(CodArtSel);
|
|
||||||
}
|
|
||||||
protected async Task ReportMacc()
|
|
||||||
{
|
|
||||||
await E_IdxMacc.InvokeAsync(IdxMaccSel);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected async Task GetArticoli()
|
|
||||||
{
|
|
||||||
if (!ListArtDisabled)
|
|
||||||
{
|
|
||||||
Log.Debug("GetArticoli");
|
|
||||||
string ApiUrl = $"{BaseAddr}api/ListSelect/GetDictArticoli?SearchArt={SearchVal}";
|
|
||||||
var rawData = await Http.GetFromJsonAsync<Dictionary<string, string>>(ApiUrl);
|
|
||||||
if (rawData != null)
|
|
||||||
{
|
|
||||||
ListArticoliAll = rawData;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
protected void FiltArticoli()
|
|
||||||
{
|
|
||||||
bool done = false;
|
|
||||||
if (!ListArtDisabled)
|
|
||||||
{
|
|
||||||
if (ListArticoliAll != null)
|
|
||||||
{
|
|
||||||
TotalCount = ListArticoliAll.Count;
|
|
||||||
ListArticoli = ListArticoliAll.Take(Num2Displ).ToDictionary(x => x.Key, x => x.Value);
|
|
||||||
DisplayCount = ListArticoli.Count;
|
|
||||||
done = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!done)
|
|
||||||
{
|
|
||||||
TotalCount = 0;
|
|
||||||
ListArticoli = new Dictionary<string, string>();
|
|
||||||
DisplayCount = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
protected async Task ReloadMacchine()
|
|
||||||
{
|
|
||||||
if (ListMacchineAll == null || ListMacchineAll.Count == 0)
|
|
||||||
{
|
|
||||||
Log.Debug("START ReloadMacchine");
|
|
||||||
string ApiUrl = $"{BaseAddr}api/ListSelect/GetDictMacc?MatrOpr={MatrOpr}";
|
|
||||||
var rawData = await Http.GetFromJsonAsync<Dictionary<string, string>>(ApiUrl);
|
|
||||||
if (rawData != null)
|
|
||||||
{
|
|
||||||
ListMacchineAll = rawData;
|
|
||||||
}
|
|
||||||
Log.Debug("END ReloadMacchine");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected bool ListArtDisabled
|
|
||||||
{
|
|
||||||
get => string.IsNullOrEmpty(SearchVal) || SearchVal.Length < SearchMinChar;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected string SearchVal
|
|
||||||
{
|
|
||||||
get => searchVal;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (searchVal != value)
|
|
||||||
{
|
|
||||||
searchVal = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected string CodArtSel
|
|
||||||
{
|
|
||||||
get => codArtSel;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (codArtSel != value)
|
|
||||||
{
|
|
||||||
codArtSel = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
protected int Num2Displ
|
|
||||||
{
|
|
||||||
get => num2Displ;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (num2Displ != value)
|
|
||||||
{
|
|
||||||
num2Displ = value;
|
|
||||||
FiltArticoli();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected string IdxMaccSel { get; set; } = "";
|
|
||||||
protected Dictionary<string, string> ListMacchineAll
|
|
||||||
{
|
|
||||||
get => MServ.DictMacchine;
|
|
||||||
set => MServ.DictMacchine = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected Dictionary<string, string> ListArticoliAll { get; set; } = new Dictionary<string, string>();
|
|
||||||
protected Dictionary<string, string>? ListArticoli { get; set; } = null;
|
|
||||||
protected int TotalCount { get; set; } = 0;
|
|
||||||
protected int DisplayCount { get; set; } = 0;
|
|
||||||
|
|
||||||
|
|
||||||
private string searchVal { get; set; } = "";
|
|
||||||
private string codArtSel { get; set; } = "";
|
|
||||||
private int num2Displ { get; set; } = 20;
|
|
||||||
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
|
|
||||||
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
|
|
||||||
<RootNamespace>MP-TAB.Client</RootNamespace>
|
|
||||||
<AssemblyName>$(AssemblyName.Replace(' ', '_'))</AssemblyName>
|
|
||||||
<RunAOTCompilation>false</RunAOTCompilation>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Remove="wwwroot\lib\**" />
|
|
||||||
<Content Remove="wwwroot\lib\**" />
|
|
||||||
<EmbeddedResource Remove="wwwroot\lib\**" />
|
|
||||||
<None Remove="wwwroot\lib\**" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Content Remove="compilerconfig.json" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<_ContentIncludedByDefault Remove="compilerconfig.json" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="compilerconfig.json" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="EgwCoreLib.Razor" Version="1.4.2308.216" />
|
|
||||||
<PackageReference Include="EgwCoreLib.Utils" Version="1.4.2308.216" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.1.23421.29" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\..\MP.Data\MP.Data.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Content Update="wwwroot\images\LogoMapoFull.png">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\images\LogoSteamware.png">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
@attribute [RenderModeAuto]
|
|
||||||
|
|
||||||
@if (CardTitles == null || CardTitles.Count == 0)
|
|
||||||
{
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12 my-2 alert alert-secondary fs-3">
|
|
||||||
waiting on browser
|
|
||||||
</div>
|
|
||||||
@for (int i = 0; i < 9; i++)
|
|
||||||
{
|
|
||||||
<div class="col-4 my-2">
|
|
||||||
<MP_TAB.Client.Components.CardTest Title="Loading" DoPlaceholder="true" CardCss="bg-secondary">
|
|
||||||
</MP_TAB.Client.Components.CardTest>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12 my-2 alert alert-success fs-3">
|
|
||||||
loaded on browser
|
|
||||||
</div>
|
|
||||||
@foreach (var item in CardTitles)
|
|
||||||
{
|
|
||||||
<div class="col-4 my-2">
|
|
||||||
<MP_TAB.Client.Components.CardTest Title="@item">
|
|
||||||
<div>
|
|
||||||
Demo content page for <b>@item</b>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
This is an example Blazor component!
|
|
||||||
</div>
|
|
||||||
</MP_TAB.Client.Components.CardTest>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public List<string>? CardTitles { get; set; }
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
@* @attribute [RenderModeAuto] *@
|
|
||||||
@attribute [RenderModeServer]
|
|
||||||
|
|
||||||
<PageTitle>Counter</PageTitle>
|
|
||||||
|
|
||||||
<h1>Counter</h1>
|
|
||||||
|
|
||||||
<p role="status">Current count: @currentCount</p>
|
|
||||||
|
|
||||||
<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private int currentCount = 0;
|
|
||||||
|
|
||||||
private void IncrementCount()
|
|
||||||
{
|
|
||||||
currentCount++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
@attribute [RenderModeAuto]
|
|
||||||
|
|
||||||
@using MP.Data.Services;
|
|
||||||
@inject MessageService MsgServ
|
|
||||||
|
|
||||||
<h1>Machine Detail</h1>
|
|
||||||
<h2><b>@IdxMacc</b></h2>
|
|
||||||
@if (CurrMSE == null)
|
|
||||||
{
|
|
||||||
<MP_TAB.Client.Components.MachineBlock FullMode="false"></MP_TAB.Client.Components.MachineBlock>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<MP_TAB.Client.Components.MachineBlock RecMSE="CurrMSE" FullMode="false"></MP_TAB.Client.Components.MachineBlock>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
public string? IdxMacc { get; set; }
|
|
||||||
|
|
||||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
|
||||||
{
|
|
||||||
// recupero MSE macchina....
|
|
||||||
if (!string.IsNullOrEmpty(IdxMacc))
|
|
||||||
{
|
|
||||||
CurrMSE = await MsgServ.GetMachineMse(IdxMacc);
|
|
||||||
}
|
|
||||||
//await InvokeAsync(StateHasChanged);
|
|
||||||
// return base.OnAfterRenderAsync(firstRender);
|
|
||||||
}
|
|
||||||
protected MappaStatoExpl? CurrMSE { get; set; } = null;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
@attribute [RenderModeAuto]
|
|
||||||
|
|
||||||
@using MP.Data.Services;
|
|
||||||
@using MP.Data;
|
|
||||||
|
|
||||||
@inject MessageService MsgServ
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
@if (ListMSE == null || ListMSE.Count == 0)
|
|
||||||
{
|
|
||||||
@for (int i = 0; i < 10; i++)
|
|
||||||
{
|
|
||||||
<div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-2 px-1 bloccoMacc">
|
|
||||||
<MP_TAB.Client.Components.MachineBlock></MP_TAB.Client.Components.MachineBlock>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@foreach (var item in ListMSE)
|
|
||||||
{
|
|
||||||
<div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-2 px-1 bloccoMacc">
|
|
||||||
<MP_TAB.Client.Components.MachineBlock RecMSE="@item" FullMode="true"></MP_TAB.Client.Components.MachineBlock>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public List<MappaStatoExpl>? ListMSE { get; set; } = null;
|
|
||||||
|
|
||||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
|
||||||
{
|
|
||||||
if (ListMSE != null)
|
|
||||||
{
|
|
||||||
// salvo in LocalStorage...
|
|
||||||
await MsgServ.SaveMse(ListMSE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
body .bloccoMacc {
|
|
||||||
font-family: 'Open Sans Condensed', sans-serif;
|
|
||||||
}
|
|
||||||
/* <= 425px */
|
|
||||||
@media all and (max-width: 425px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 0.6em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* > 425px con 2 blocchi */
|
|
||||||
@media all and (min-width: 425px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 0.8em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* > 600px con 2 colonne */
|
|
||||||
@media all and (min-width: 600px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 1.2em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* > 800px */
|
|
||||||
@media all and (min-width: 800px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 1em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* > 1024px */
|
|
||||||
@media all and (min-width: 1024px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 1.1em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* > 1440px */
|
|
||||||
@media all and (min-width: 1600px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 1.2em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
body /* gestione area mappa stato e pagine dettaglio macchina */
|
|
||||||
.bloccoMacc {
|
|
||||||
font-family: 'Open Sans Condensed', sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* <= 425px */
|
|
||||||
@media all and (max-width: 425px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 0.6em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* > 425px con 2 blocchi */
|
|
||||||
@media all and (min-width: 425px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 0.8em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* > 600px con 2 colonne */
|
|
||||||
@media all and (min-width: 600px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 1.2em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* > 800px */
|
|
||||||
@media all and (min-width: 800px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 1em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* > 1024px */
|
|
||||||
@media all and (min-width: 1024px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 1.1em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* > 1440px */
|
|
||||||
@media all and (min-width: 1600px) {
|
|
||||||
.bloccoMacc {
|
|
||||||
font-size: 1.2em;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
body .bloccoMacc{font-family:'Open Sans Condensed',sans-serif;}@media all and (max-width:425px){.bloccoMacc{font-size:.6em;}}@media all and (min-width:425px){.bloccoMacc{font-size:.8em;}}@media all and (min-width:600px){.bloccoMacc{font-size:1.2em;}}@media all and (min-width:800px){.bloccoMacc{font-size:1em;}}@media all and (min-width:1024px){.bloccoMacc{font-size:1.1em;}}@media all and (min-width:1600px){.bloccoMacc{font-size:1.2em;}}
|
|
||||||
@@ -1,190 +0,0 @@
|
|||||||
@using NLog;
|
|
||||||
@attribute [RenderModeAuto]
|
|
||||||
@* @attribute [RenderModeServer] *@
|
|
||||||
|
|
||||||
@inject HttpClient Http
|
|
||||||
|
|
||||||
<div class="card">
|
|
||||||
<div class="card-header px-2">
|
|
||||||
<MP_TAB.Client.Components.TcHistoryFilter Title="Storico Tempi Ciclo" SearchMinChar="@SearchMinChar" E_CodArt="SelCodArt" E_IdxMacc="SelIdxMacc" MatrOpr="@MatrOpr"></MP_TAB.Client.Components.TcHistoryFilter>
|
|
||||||
</div>
|
|
||||||
<div class="card-body px-2">
|
|
||||||
<table class="table table-striped table-sm">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>Articolo</th>
|
|
||||||
<th>Informazioni</th>
|
|
||||||
@* <th>TCiclo</th> *@
|
|
||||||
@* <th>Note</th> *@
|
|
||||||
@* <th class="text-end">Impianto</th> *@
|
|
||||||
<th>Periodo</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
@if (isLoading)
|
|
||||||
{
|
|
||||||
@for (int i = 0; i < NumRecPage; i++)
|
|
||||||
{
|
|
||||||
<tr class="placeholder-glow">
|
|
||||||
<td>
|
|
||||||
<div class="placeholder col-4"></div>
|
|
||||||
<small class="placeholder col-8"></small>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<div class="placeholder col-6"></div>
|
|
||||||
<small class="placeholder col-6"></small>
|
|
||||||
</td>
|
|
||||||
@* <td><span class="placeholder col-12"></span></td> *@
|
|
||||||
<td><span class="placeholder col-12"></span></td>
|
|
||||||
<td class="text-end">
|
|
||||||
<div class="placeholder col-10"></div>
|
|
||||||
<small class="placeholder col-10"></small>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@if (ListODL == null || ListODL.Count == 0)
|
|
||||||
{
|
|
||||||
<tr>
|
|
||||||
<td colspan="5">
|
|
||||||
<div class="alert alert-warning fs-3 w-100">Nessun record trovato</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
foreach (var item in ListODL)
|
|
||||||
{
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<div>@item.CodArticolo</div>
|
|
||||||
<small class="text-secondary">@item.DescArticolo</small>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<div>
|
|
||||||
<small><b>Impianto:</b> @item.IdxMacchina</small>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<small><b>TC:</b> @item.Tcassegnato.ToString("N3")</small>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<small><b>N° pz:</b> @item.NumPezzi pz</small>
|
|
||||||
</div>
|
|
||||||
<div class="badge text-bg-light border border-primary">
|
|
||||||
<small class="text-secondary">@item.Note</small>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
@* <td></td> *@
|
|
||||||
<td>
|
|
||||||
<div>
|
|
||||||
<small><b>Inizio:</b> @item.DataInizio</small>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<small><b>Fine:</b> @item.DataFine</small>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
@* <td class="text-end">
|
|
||||||
</td> *@
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div class="card-footer">
|
|
||||||
<EgwCoreLib.Razor.DataPager currPage="@PageNum" PageSize="@NumRecPage" totalCount="@TotalCount" numPageChanged="SavePage" numRecordChanged="SaveNumRec"></EgwCoreLib.Razor.DataPager>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
[Parameter]
|
|
||||||
public int MatrOpr { get; set; } = 0;
|
|
||||||
|
|
||||||
[Inject]
|
|
||||||
protected IConfiguration config { get; set; } = null!;
|
|
||||||
|
|
||||||
protected int SearchMinChar = 3;
|
|
||||||
protected string CodArt = "";
|
|
||||||
protected string IdxMacc = "*";
|
|
||||||
protected string BaseAddr = "";
|
|
||||||
protected bool isLoading = false;
|
|
||||||
|
|
||||||
protected int NumRecPage = 5;
|
|
||||||
protected int TotalCount = 0;
|
|
||||||
protected int PageNum = 1;
|
|
||||||
|
|
||||||
protected List<ODLExpModel> ListComplete { get; set; } = new List<ODLExpModel>();
|
|
||||||
protected List<ODLExpModel> ListODL { get; set; } = new List<ODLExpModel>();
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
BaseAddr = config.GetValue<string>("OptConf:BaseAddr") ?? "";
|
|
||||||
await ReloadData();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected async Task SelCodArt(string newCodArt)
|
|
||||||
{
|
|
||||||
CodArt = newCodArt;
|
|
||||||
await ReloadData();
|
|
||||||
}
|
|
||||||
protected async Task SelIdxMacc(string newIdxMacc)
|
|
||||||
{
|
|
||||||
IdxMacc = newIdxMacc;
|
|
||||||
await ReloadData();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected async Task ReloadData()
|
|
||||||
{
|
|
||||||
isLoading = true;
|
|
||||||
if (!string.IsNullOrEmpty(CodArt))
|
|
||||||
{
|
|
||||||
string ApiUrl = $"{BaseAddr}api/ODL/GetODL?CodArt={CodArt}&IdxMacchina={IdxMacc}";
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var rawData = await Http.GetFromJsonAsync<List<ODLExpModel>>(ApiUrl);
|
|
||||||
if (rawData != null)
|
|
||||||
{
|
|
||||||
ListComplete = rawData;
|
|
||||||
TotalCount = ListComplete.Count;
|
|
||||||
// esegue paginazione
|
|
||||||
UpdateTable();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception exc)
|
|
||||||
{
|
|
||||||
Log.Error($"Error on dataload{Environment.NewLine}{exc}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
isLoading = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void UpdateTable()
|
|
||||||
{
|
|
||||||
// esegue paginazione
|
|
||||||
if (TotalCount > NumRecPage)
|
|
||||||
{
|
|
||||||
ListODL = ListComplete.Skip((PageNum - 1) * NumRecPage).Take(NumRecPage).ToList();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ListODL = ListComplete;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void SavePage(int newNum)
|
|
||||||
{
|
|
||||||
PageNum = newNum;
|
|
||||||
UpdateTable();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void SaveNumRec(int newNum)
|
|
||||||
{
|
|
||||||
NumRecPage = newNum;
|
|
||||||
UpdateTable();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
using Blazored.LocalStorage;
|
|
||||||
using Blazored.SessionStorage;
|
|
||||||
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
|
|
||||||
using MP.Data.Services;
|
|
||||||
|
|
||||||
var builder = WebAssemblyHostBuilder.CreateDefault(args);
|
|
||||||
|
|
||||||
// servizio cache locale dati
|
|
||||||
builder.Services.AddSingleton<SharedMemService>();
|
|
||||||
builder.Services.AddScoped<MessageService>();
|
|
||||||
builder.Services.AddBlazoredLocalStorage();
|
|
||||||
builder.Services.AddBlazoredSessionStorage();
|
|
||||||
|
|
||||||
// aggiunto x gestione chiamate WebAPI
|
|
||||||
builder.Services.AddScoped(sp =>
|
|
||||||
new HttpClient
|
|
||||||
{
|
|
||||||
BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
await builder.Build().RunAsync();
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
@using System.Net.Http
|
|
||||||
@using System.Net.Http.Json
|
|
||||||
@using Microsoft.AspNetCore.Components.Forms
|
|
||||||
@using Microsoft.AspNetCore.Components.Routing
|
|
||||||
@using Microsoft.AspNetCore.Components.Sections
|
|
||||||
@using Microsoft.AspNetCore.Components.Web
|
|
||||||
@using Microsoft.AspNetCore.Components.Web.Virtualization
|
|
||||||
@using Microsoft.JSInterop
|
|
||||||
@using MP_TAB.Client
|
|
||||||
@using MP.Data.DatabaseModels
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"outputFile": "Components/MachineBlock.razor.css",
|
|
||||||
"inputFile": "Components/MachineBlock.razor.less"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"outputFile": "Pages/StatusMap.razor.css",
|
|
||||||
"inputFile": "Pages/StatusMap.razor.less"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 154 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 85 KiB |
@@ -1,50 +0,0 @@
|
|||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
|
||||||
# Visual Studio Version 16
|
|
||||||
VisualStudioVersion = 16.0.0.0
|
|
||||||
MinimumVisualStudioVersion = 16.0.0.0
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP-TAB", "MP-TAB\MP-TAB.csproj", "{2410D33B-FFA6-45A6-B7B5-15F21A160223}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP-TAB.Client", "MP-TAB.Client\MP-TAB.Client.csproj", "{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}"
|
|
||||||
EndProject
|
|
||||||
Global
|
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
||||||
Debug|Any CPU = Debug|Any CPU
|
|
||||||
Debug|x64 = Debug|x64
|
|
||||||
Debug|x86 = Debug|x86
|
|
||||||
Release|Any CPU = Release|Any CPU
|
|
||||||
Release|x64 = Release|x64
|
|
||||||
Release|x86 = Release|x86
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|x86.ActiveCfg = Debug|Any CPU
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Debug|x86.Build.0 = Debug|Any CPU
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|x86.ActiveCfg = Release|Any CPU
|
|
||||||
{416F58AA-12AD-4D58-A0C0-E75B4DE4C639}.Release|x86.Build.0 = Release|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|x86.ActiveCfg = Debug|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Debug|x86.Build.0 = Debug|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|x86.ActiveCfg = Release|Any CPU
|
|
||||||
{2410D33B-FFA6-45A6-B7B5-15F21A160223}.Release|x86.Build.0 = Release|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
|
||||||
SolutionGuid = {A308E5FF-9B15-451D-BFB6-47D4CDEC6C03}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"version": 1,
|
|
||||||
"isRoot": true,
|
|
||||||
"tools": {}
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
|
|
||||||
@* <meta name="viewport" content="width=device-width, initial-scale=1" /> *@
|
|
||||||
<meta name="mobile-web-app-capable" content="yes" />
|
|
||||||
<meta name="description" content="MP Tablet" />
|
|
||||||
<meta name="author" content="EgalWare" />
|
|
||||||
<link rel="shortcut icon" href="images/favicon.ico" />
|
|
||||||
<base href="/MP/TAB2/" />
|
|
||||||
<link rel="stylesheet" href="lib/font-awesome/css/all.min.css" />
|
|
||||||
<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
|
|
||||||
<link rel="stylesheet" href="font.min.css" />
|
|
||||||
<link rel="stylesheet" href="app.min.css" />
|
|
||||||
<link rel="stylesheet" href="MP-TAB.styles.css" />
|
|
||||||
<link rel="icon" type="image/png" href="images/favicon.png" />
|
|
||||||
<HeadOutlet />
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<Routes />
|
|
||||||
<script src="_framework/blazor.web.js"></script>
|
|
||||||
<script src="lib/bootstrap/js/bootstrap.bundle.js"></script>
|
|
||||||
<script src="lib/WindowSize.js"></script>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
@using NLog;
|
|
||||||
@inherits LayoutComponentBase
|
|
||||||
|
|
||||||
@inject NavigationManager NavMan
|
|
||||||
@inject ListSelectDataSrv MDataService
|
|
||||||
@inject SharedMemService MStor
|
|
||||||
|
|
||||||
<div class="page">
|
|
||||||
<main>
|
|
||||||
<div class="top-row d-flex justify-content-between">
|
|
||||||
<div class="col-4">
|
|
||||||
<span>
|
|
||||||
<button class="btn btn-sm @ResetClass" @onclick="() => ForceReload()" title="Update"><i class="fa-solid fa-rotate"></i></button>
|
|
||||||
Username
|
|
||||||
</span>
|
|
||||||
<sub>[999]</sub>
|
|
||||||
</div>
|
|
||||||
<div class="col-4 text-center">
|
|
||||||
<a href="status-map" class="text-decoration-none text-light">
|
|
||||||
MapoTAB2
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
<div class="col-4 text-end">
|
|
||||||
<button class="btn btn-sm btn-dark" @onclick="() => OnYes()">Yes!</button>
|
|
||||||
<div class="row w-100 slideMen">
|
|
||||||
<div class="">
|
|
||||||
<SlideMenu MenuItems="@CurrMenuItems"></SlideMenu>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<article class="content d-flex">
|
|
||||||
<div class="" id="mainBody">
|
|
||||||
@Body
|
|
||||||
</div>
|
|
||||||
<div class="sidebar" id="barLat">
|
|
||||||
<NavMenu MenuItems="@CurrMenuItems"></NavMenu>
|
|
||||||
</div>
|
|
||||||
</article>
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="blazor-error-ui">
|
|
||||||
An unhandled error has occurred.
|
|
||||||
<a href="" class="reload">Reload</a>
|
|
||||||
<a class="dismiss">🗙</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
@code {
|
|
||||||
/// <summary>
|
|
||||||
/// Elenco items da menù per pagina corrente...
|
|
||||||
/// </summary>
|
|
||||||
protected List<LinkMenu> CurrMenuItems { get; set; } = new List<LinkMenu>();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Livello corrente del menu
|
|
||||||
/// </summary>
|
|
||||||
protected string CurrLevel { get; set; } = "";
|
|
||||||
|
|
||||||
protected string ResetClass = "btn-primary";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Init struttura dati
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
CurrLevel = MStor.PageLevel(NavMan.Uri);
|
|
||||||
if (MStor.DictMenu.ContainsKey(CurrLevel))
|
|
||||||
{
|
|
||||||
CurrMenuItems = MStor.DictMenu[CurrLevel];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
CurrMenuItems = await MDataService.ListLinkFilt(CurrLevel);
|
|
||||||
MStor.DictMenu.Add(CurrLevel, CurrMenuItems);
|
|
||||||
}
|
|
||||||
await Task.Delay(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Logger Log = LogManager.GetCurrentClassLogger();
|
|
||||||
|
|
||||||
protected async Task ForceReload()
|
|
||||||
{
|
|
||||||
Log.Info("Start ForceReload");
|
|
||||||
ResetClass = "btn-warning";
|
|
||||||
await InvokeAsync(StateHasChanged);
|
|
||||||
await MDataService.FlushCache();
|
|
||||||
MStor.ResetCache();
|
|
||||||
await Task.Delay(200);
|
|
||||||
ResetClass = "btn-primary";
|
|
||||||
await InvokeAsync(StateHasChanged);
|
|
||||||
Log.Info("END ForceReload");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void OnYes()
|
|
||||||
{
|
|
||||||
Console.WriteLine($"{DateTime.Now} | 'Yes' button selected.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
.page {
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
main {
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar {
|
|
||||||
/*background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);*/
|
|
||||||
padding: 0 10px 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row {
|
|
||||||
background-color: #05173d;
|
|
||||||
/*border-bottom: 1px solid #d6d5d5;*/
|
|
||||||
justify-content: flex-end;
|
|
||||||
height: 3.5rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row ::deep a, .top-row ::deep .btn-link {
|
|
||||||
white-space: nowrap;
|
|
||||||
/*margin-left: 1.5rem;*/
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row ::deep a:first-child {
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 640.98px) {
|
|
||||||
.slideMen:not(.auth) {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#mainBody {
|
|
||||||
width: 83%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@media (max-width: 640.98px) {
|
|
||||||
.top-row:not(.auth) {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#mainBody {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row.auth {
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row ::deep a, .top-row ::deep .btn-link {
|
|
||||||
margin-left: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 641px) {
|
|
||||||
.page {
|
|
||||||
flex-direction: row;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar {
|
|
||||||
width: 250px;
|
|
||||||
height: 100vh;
|
|
||||||
position: sticky;
|
|
||||||
top: 0;
|
|
||||||
left: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row {
|
|
||||||
position: sticky;
|
|
||||||
top: 0;
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row.auth ::deep a:first-child {
|
|
||||||
flex: 1;
|
|
||||||
text-align: right;
|
|
||||||
width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row, article {
|
|
||||||
padding-left: 1rem !important;
|
|
||||||
padding-right: .5rem !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
#blazor-error-ui {
|
|
||||||
background: lightyellow;
|
|
||||||
bottom: 0;
|
|
||||||
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
|
|
||||||
display: none;
|
|
||||||
left: 0;
|
|
||||||
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
|
|
||||||
position: fixed;
|
|
||||||
width: 100%;
|
|
||||||
z-index: 1000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#blazor-error-ui .dismiss {
|
|
||||||
cursor: pointer;
|
|
||||||
position: absolute;
|
|
||||||
right: 0.75rem;
|
|
||||||
top: 0.5rem;
|
|
||||||
}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
@inject NavigationManager NavMan
|
|
||||||
@inject ListSelectDataSrv MDataService
|
|
||||||
|
|
||||||
@* <div class="row w-100 slideMen"> *@
|
|
||||||
@* <div class="row w-100 slideMen">
|
|
||||||
<div class="col-4">
|
|
||||||
<MP_TAB.Client.Components.SlideMenu MenuItems="@MenuItems"></MP_TAB.Client.Components.SlideMenu>
|
|
||||||
</div>
|
|
||||||
<div class="col-4">
|
|
||||||
</div>
|
|
||||||
<div class="col-4">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
*@
|
|
||||||
@* <div class="top-row ps-3 navbar navbar-dark">
|
|
||||||
<div class="container-fluid">
|
|
||||||
<a class="navbar-brand" href="">MyBlazorWeb</a>
|
|
||||||
</div>
|
|
||||||
</div> *@
|
|
||||||
@* <input type="checkbox" title="Navigation menu" class="navbar-toggler" /> *@
|
|
||||||
|
|
||||||
@* <div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()"> *@
|
|
||||||
<div class="nav-scrollable">
|
|
||||||
<div class="bg-dark text-center py-2">
|
|
||||||
<i class="fa-solid fa-link"></i> <span class="fw-bold">Link diretti</span>
|
|
||||||
</div>
|
|
||||||
<nav class="flex-column">
|
|
||||||
|
|
||||||
@if (MenuItems != null && MenuItems.Count > 0)
|
|
||||||
{
|
|
||||||
foreach (var item in MenuItems)
|
|
||||||
{
|
|
||||||
<div class="nav-item px-2">
|
|
||||||
<NavLink class="nav-link px-2" href="@item.NavigateUrl">
|
|
||||||
<i class="fa fa-lg @item.icona pe-2" aria-hidden="true"></i> @item.Testo
|
|
||||||
</NavLink>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
<br />
|
|
||||||
|
|
||||||
<div class="nav-item px-2">
|
|
||||||
<NavLink class="nav-link px-2" href="" Match="NavLinkMatch.All">
|
|
||||||
<span class="bi bi-house-door-fill" aria-hidden="true"></span> Home
|
|
||||||
</NavLink>
|
|
||||||
</div>
|
|
||||||
<div class="nav-item px-2">
|
|
||||||
<NavLink class="nav-link px-2" href="counter">
|
|
||||||
<span class="bi bi-plus-square-fill" aria-hidden="true"></span> Counter
|
|
||||||
</NavLink>
|
|
||||||
</div>
|
|
||||||
<div class="nav-item px-2">
|
|
||||||
<NavLink class="nav-link px-2" href="weather">
|
|
||||||
<span class="bi bi-list-nested" aria-hidden="true"></span> Weather
|
|
||||||
</NavLink>
|
|
||||||
</div>
|
|
||||||
<div class="nav-item px-2">
|
|
||||||
<NavLink class="nav-link px-2" href="CardDemo">
|
|
||||||
<span class="bi bi-plus-square-fill" aria-hidden="true"></span> CardDemo
|
|
||||||
</NavLink>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code{
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public List<LinkMenu> MenuItems { get; set; } = new List<LinkMenu>();
|
|
||||||
}
|
|
||||||
@@ -1,112 +0,0 @@
|
|||||||
.navbar-toggler {
|
|
||||||
appearance: none;
|
|
||||||
cursor: pointer;
|
|
||||||
width: 3.5rem;
|
|
||||||
height: 2.5rem;
|
|
||||||
color: white;
|
|
||||||
position: absolute;
|
|
||||||
top: 0.5rem;
|
|
||||||
right: 1rem;
|
|
||||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
|
||||||
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-toggler:checked {
|
|
||||||
background-color: rgba(255, 255, 255, 0.5);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-row {
|
|
||||||
height: 3.5rem;
|
|
||||||
background-color: rgba(0,0,0,0.4);
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-brand {
|
|
||||||
font-size: 1.1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bi {
|
|
||||||
display: inline-block;
|
|
||||||
position: relative;
|
|
||||||
width: 1.25rem;
|
|
||||||
height: 1.25rem;
|
|
||||||
margin-right: 0.75rem;
|
|
||||||
top: -1px;
|
|
||||||
background-size: cover;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@media (min-width: 640.98px) {
|
|
||||||
.slideMen:not(.auth) {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.bi-house-door-fill {
|
|
||||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
|
|
||||||
}
|
|
||||||
|
|
||||||
.bi-plus-square-fill {
|
|
||||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
|
|
||||||
}
|
|
||||||
|
|
||||||
.bi-list-nested {
|
|
||||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item {
|
|
||||||
font-size: 0.9rem;
|
|
||||||
padding-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item:first-of-type {
|
|
||||||
padding-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item:last-of-type {
|
|
||||||
padding-bottom: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item ::deep a {
|
|
||||||
color: rgba(33, 36, 39, 11);
|
|
||||||
border-radius: 4px;
|
|
||||||
height: 3rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
line-height: 3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item ::deep a.active {
|
|
||||||
background-color: rgb(33, 36, 39);
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-item ::deep a:hover {
|
|
||||||
background-color: rgba(33, 36, 39, 0.4);
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-scrollable {
|
|
||||||
display: none;
|
|
||||||
background-color: #f2f2f2;
|
|
||||||
border-radius: 0.375rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.navbar-toggler:checked ~ .nav-scrollable {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 641px) {
|
|
||||||
.navbar-toggler {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-scrollable {
|
|
||||||
/* Never collapse the sidebar for wide screens */
|
|
||||||
display: block;
|
|
||||||
|
|
||||||
/* Allow sidebar to scroll for tall menus */
|
|
||||||
/*height: calc(100vh - 3.5rem);*/
|
|
||||||
overflow-y: auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
@* @attribute [StreamRendering(true)] *@
|
|
||||||
|
|
||||||
<!-- Temporary workaround until MapRazorComponents supports AddAdditionalAssemblies -->
|
|
||||||
<!-- Once that is implemented, the main project won't need to include this file -->
|
|
||||||
<MP_TAB.Client.Components.SlideMenu MenuItems="@MenuItems"></MP_TAB.Client.Components.SlideMenu>
|
|
||||||
@code {
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public List<LinkMenu> MenuItems { get; set; } = new List<LinkMenu>();
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
@page "/CardDemo"
|
|
||||||
@attribute [StreamRendering(true)]
|
|
||||||
|
|
||||||
<!-- Temporary workaround until MapRazorComponents supports AddAdditionalAssemblies -->
|
|
||||||
<!-- Once that is implemented, the main project won't need to include this file -->
|
|
||||||
@if (ListTitle == null)
|
|
||||||
{
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12 my-2 alert alert-warning fs-3">
|
|
||||||
executing on server
|
|
||||||
</div>
|
|
||||||
@for (int i = 0; i < 9; i++)
|
|
||||||
{
|
|
||||||
<div class="col-4 my-2">
|
|
||||||
<MP_TAB.Client.Components.CardTest Title="Loading" DoPlaceholder="true" CardCss="bg-warning">
|
|
||||||
</MP_TAB.Client.Components.CardTest>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<MP_TAB.Client.Pages.CardDemoList CardTitles="@ListTitle"></MP_TAB.Client.Pages.CardDemoList>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
|
|
||||||
protected List<string>? ListTitle { get; set; }
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
ListTitle = null;
|
|
||||||
await Task.Delay(300);
|
|
||||||
ListTitle = new List<string>();
|
|
||||||
await InvokeAsync(StateHasChanged);
|
|
||||||
await Task.Delay(300);
|
|
||||||
for (int i = 0; i < 9; i++)
|
|
||||||
{
|
|
||||||
ListTitle.Add($"Card {i + 1:00}");
|
|
||||||
}
|
|
||||||
await Task.Delay(10);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
@page "/counter"
|
|
||||||
|
|
||||||
<!-- Temporary workaround until MapRazorComponents supports AddAdditionalAssemblies -->
|
|
||||||
<!-- Once that is implemented, the main project won't need to include this file -->
|
|
||||||
|
|
||||||
<MP_TAB.Client.Pages.Counter />
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
@page "/hw-sw-info"
|
|
||||||
|
|
||||||
<h3>HwSw Info</h3>
|
|
||||||
|
|
||||||
|
|
||||||
@code {
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
@page "/logout"
|
|
||||||
|
|
||||||
<h3>logout</h3>
|
|
||||||
|
|
||||||
|
|
||||||
@code {
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
@page "/machine-detail"
|
|
||||||
@* @page "/machine-detail/{IdxMacc}" *@
|
|
||||||
|
|
||||||
<!-- Temporary workaround until MapRazorComponents supports AddAdditionalAssemblies -->
|
|
||||||
<!-- Once that is implemented, the main project won't need to include this file -->
|
|
||||||
<MP_TAB.Client.Pages.MachineDetail IdxMacc="@IdxMacc"></MP_TAB.Client.Pages.MachineDetail>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
[SupplyParameterFromQuery(Name = "IdxMacc")]
|
|
||||||
public string? IdxMacc { get; set; }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
@page "/"
|
|
||||||
@page "/home"
|
|
||||||
@page "/status-map"
|
|
||||||
|
|
||||||
@attribute [StreamRendering(false)]
|
|
||||||
|
|
||||||
<!-- Temporary workaround until MapRazorComponents supports AddAdditionalAssemblies -->
|
|
||||||
<!-- Once that is implemented, the main project won't need to include this file -->
|
|
||||||
@if (CurrListMSE == null || CurrListMSE.Count == 0)
|
|
||||||
{
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12 my-2 alert alert-warning fs-3">
|
|
||||||
executing on server
|
|
||||||
</div>
|
|
||||||
@for (int i = 0; i < 10; i++)
|
|
||||||
{
|
|
||||||
<div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-2 px-1 bloccoMacc">
|
|
||||||
<MP_TAB.Client.Components.MachineBlock></MP_TAB.Client.Components.MachineBlock>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<MP_TAB.Client.Pages.StatusMap ListMSE="@CurrListMSE"></MP_TAB.Client.Pages.StatusMap>
|
|
||||||
}
|
|
||||||
@@ -1,215 +0,0 @@
|
|||||||
using global::System;
|
|
||||||
using global::System.Collections.Generic;
|
|
||||||
using global::System.Linq;
|
|
||||||
using global::System.Threading.Tasks;
|
|
||||||
using global::Microsoft.AspNetCore.Components;
|
|
||||||
using System.Net.Http;
|
|
||||||
using System.Net.Http.Json;
|
|
||||||
using Microsoft.AspNetCore.Components.Forms;
|
|
||||||
using Microsoft.AspNetCore.Components.Routing;
|
|
||||||
using Microsoft.AspNetCore.Components.Sections;
|
|
||||||
using Microsoft.AspNetCore.Components.Web;
|
|
||||||
using Microsoft.AspNetCore.Components.Web.Virtualization;
|
|
||||||
using Microsoft.JSInterop;
|
|
||||||
using MP.Data;
|
|
||||||
using MP.Data.DatabaseModels;
|
|
||||||
using MP.Data.DTO;
|
|
||||||
using MP.Data.Services;
|
|
||||||
using MP_TAB;
|
|
||||||
using MP_TAB.Components;
|
|
||||||
using NLog;
|
|
||||||
using MP.Data.Conf;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
using static System.Runtime.InteropServices.JavaScript.JSType;
|
|
||||||
|
|
||||||
namespace MP_TAB.Components.Pages
|
|
||||||
{
|
|
||||||
public partial class StatusMap
|
|
||||||
{
|
|
||||||
#region Protected Fields
|
|
||||||
|
|
||||||
protected bool doAnimate = true;
|
|
||||||
protected int keepAliveMin = 1;
|
|
||||||
protected int maxCol = 6;
|
|
||||||
protected string showArt = "";
|
|
||||||
protected int slowRefreshSec = 300;
|
|
||||||
|
|
||||||
#endregion Protected Fields
|
|
||||||
|
|
||||||
#region Protected Properties
|
|
||||||
|
|
||||||
[Inject]
|
|
||||||
protected StatusData MDataService { get; set; } = null!;
|
|
||||||
[Inject]
|
|
||||||
protected MessageService MsgServ { get; set; } = null!;
|
|
||||||
|
|
||||||
protected int slowRefreshMs
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
// tempo variabile tra +/- 10% del target
|
|
||||||
int answ = rnd.Next(900, 1100) * slowRefreshSec;
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Protected Properties
|
|
||||||
|
|
||||||
#region Protected Methods
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera il valore e se trovato aggiorna
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="chiave">Valore da cercare</param>
|
|
||||||
/// <param name="varObj">String in cui salvare il valore se trovato</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected bool getConfVal(string chiave, ref string varObj)
|
|
||||||
{
|
|
||||||
bool answ = false;
|
|
||||||
if (CurrConfig != null && CurrConfig.Count > 0)
|
|
||||||
{
|
|
||||||
// sistemo i parametri opzionali...
|
|
||||||
ConfigModel? risultato = CurrConfig.FirstOrDefault(x => x.Chiave == chiave);
|
|
||||||
if (risultato != null)
|
|
||||||
{
|
|
||||||
varObj = risultato.Valore;
|
|
||||||
answ = !string.IsNullOrEmpty(risultato.Valore);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera il valore e se trovato aggiorna
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="chiave">Valore da cercare</param>
|
|
||||||
/// <param name="varObj">Int in cui salvare il valore se trovato</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected bool getConfValInt(string chiave, ref int varObj)
|
|
||||||
{
|
|
||||||
bool answ = false;
|
|
||||||
if (CurrConfig != null && CurrConfig.Count > 0)
|
|
||||||
{
|
|
||||||
// sistemo i parametri opzionali...
|
|
||||||
ConfigModel? risultato = CurrConfig.FirstOrDefault(x => x.Chiave == chiave);
|
|
||||||
if (risultato != null)
|
|
||||||
{
|
|
||||||
answ = int.TryParse(risultato.Valore, out varObj);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera da conf eventuale setup tag dell'IOB indicato
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="codIob"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected List<TagData>? getIobTag(string codIob)
|
|
||||||
{
|
|
||||||
List<TagData>? answ = null;
|
|
||||||
if (MDataService.currTagConf != null)
|
|
||||||
{
|
|
||||||
// cerco x chiave IOB...
|
|
||||||
if (MDataService.currTagConf.ContainsKey(codIob))
|
|
||||||
{
|
|
||||||
answ = MDataService.currTagConf[codIob];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera da redis (in una chiamata soltanto) tutti i valori richiesti e compone un
|
|
||||||
/// dizionario x ottimizzare visualizzazione
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="codIob"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
protected Dictionary<string, string> getTagVal(string codIob)
|
|
||||||
{
|
|
||||||
Dictionary<string, string> answ = new Dictionary<string, string>();
|
|
||||||
// recupero conf tags...
|
|
||||||
var currTags = getIobTag(codIob);
|
|
||||||
if (currTags != null && currTags.Count > 0)
|
|
||||||
{
|
|
||||||
// FIXME TODO !!!! FARE !!!! - da verificare
|
|
||||||
answ = currTags.ToDictionary(x => x.TagLocation, x => MDataService.getTagConf(x.TagLocation));
|
|
||||||
}
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
CurrListMSE = null;
|
|
||||||
await setupConf();
|
|
||||||
//await InvokeAsync(StateHasChanged);
|
|
||||||
//await Task.Delay(500);
|
|
||||||
await ReloadData();
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Protected Methods
|
|
||||||
|
|
||||||
#region Private Fields
|
|
||||||
|
|
||||||
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
|
|
||||||
|
|
||||||
private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000);
|
|
||||||
|
|
||||||
private List<ConfigModel>? CurrConfig = null;
|
|
||||||
|
|
||||||
private Random rnd = new Random();
|
|
||||||
|
|
||||||
#endregion Private Fields
|
|
||||||
|
|
||||||
#region Private Properties
|
|
||||||
|
|
||||||
private List<MappaStatoExpl>? CurrListMSE { get; set; } = null;
|
|
||||||
|
|
||||||
#endregion Private Properties
|
|
||||||
|
|
||||||
#region Private Methods
|
|
||||||
|
|
||||||
private async Task ReloadData()
|
|
||||||
{
|
|
||||||
CurrListMSE = await MDataService.MseGetAll();
|
|
||||||
//try
|
|
||||||
//{
|
|
||||||
// // salvo in LocalStorage...
|
|
||||||
// await MsgServ.SaveMse(CurrListMSE);
|
|
||||||
//}
|
|
||||||
//catch (Exception exc)
|
|
||||||
//{
|
|
||||||
// Log.Error($"Eccezione in ReloadData{Environment.NewLine}{exc}");
|
|
||||||
//}
|
|
||||||
}
|
|
||||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
|
||||||
{
|
|
||||||
if (CurrListMSE != null)
|
|
||||||
{
|
|
||||||
// salvo in LocalStorage...
|
|
||||||
await MsgServ.SaveMse(CurrListMSE);
|
|
||||||
//return base.OnAfterRenderAsync(firstRender);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private async Task setupConf()
|
|
||||||
{
|
|
||||||
CurrConfig = await MDataService.ConfigGetAll();
|
|
||||||
if (CurrConfig != null && CurrConfig.Count > 0)
|
|
||||||
{
|
|
||||||
// sistemo i parametri opzionali...
|
|
||||||
getConfValInt("keepAliveMin", ref keepAliveMin);
|
|
||||||
getConfValInt("MON_maxCol", ref maxCol);
|
|
||||||
int intDoAnim = 0;
|
|
||||||
getConfValInt("doAnimate", ref intDoAnim);
|
|
||||||
doAnimate = intDoAnim == 1;
|
|
||||||
getConfValInt("pageRefreshSec", ref slowRefreshSec);
|
|
||||||
getConfVal("sART", ref showArt);
|
|
||||||
Log.Info($"setupConf | Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Private Methods
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
@page "/tc-history"
|
|
||||||
|
|
||||||
@using MP_TAB.Data
|
|
||||||
@inject MessageService MServ
|
|
||||||
|
|
||||||
<MP_TAB.Client.Pages.TCHistory MatrOpr="@MatrOpr"></MP_TAB.Client.Pages.TCHistory>
|
|
||||||
|
|
||||||
@code{
|
|
||||||
|
|
||||||
private int MatrOpr { get; set; } = 0;
|
|
||||||
|
|
||||||
protected override void OnInitialized()
|
|
||||||
{
|
|
||||||
MatrOpr = MServ.MatrOpr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,105 +0,0 @@
|
|||||||
@page "/user"
|
|
||||||
@* <MP_TAB.Client.Pages.User></MP_TAB.Client.Pages.User> *@
|
|
||||||
@using NLog;
|
|
||||||
@* @attribute [RenderModeAuto] *@
|
|
||||||
@attribute [RenderModeServer]
|
|
||||||
|
|
||||||
@inject IJSRuntime JSRuntime
|
|
||||||
@inject HttpClient Http
|
|
||||||
@inject IHttpContextAccessor httpContextAccessor
|
|
||||||
|
|
||||||
<h3>User</h3>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="d-flex">
|
|
||||||
<div class="col-3"></div>
|
|
||||||
<div class="card col-6">
|
|
||||||
<div class="card-header text-center">
|
|
||||||
<div style="font-size: 4rem;">
|
|
||||||
<i class="fa-solid fa-user"></i>
|
|
||||||
</div>
|
|
||||||
<div style="font-size: 1.5rem;">
|
|
||||||
<span>USER DATA</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="card-body">
|
|
||||||
<div>
|
|
||||||
<ul class="list-group">
|
|
||||||
<li class="list-group-item d-flex justify-content-between">
|
|
||||||
<div class="text-start">User</div>
|
|
||||||
<div class="text-end"><b>USERNAME[999]</b></div>
|
|
||||||
</li>
|
|
||||||
<li class="list-group-item d-flex justify-content-between">
|
|
||||||
<div class="text-start">Server Time</div>
|
|
||||||
<div class="text-end"><b>@($"{DateTime.Now.ToString("dddd dd.MM.yyyy HH:mm.ss")}")</b></div>
|
|
||||||
</li>
|
|
||||||
<li class="list-group-item d-flex justify-content-between">
|
|
||||||
<div class="text-start">Client IP</div>
|
|
||||||
<div class="text-end"><b>@currIpv4</b></div>
|
|
||||||
</li>
|
|
||||||
<li class="list-group-item d-flex justify-content-between">
|
|
||||||
<div class="text-start">Browser Size</div>
|
|
||||||
<div class="text-end"><b>@($"{Width}x{Height}")</b></div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="card-footer">
|
|
||||||
<button class="w-100 btn btn-success">
|
|
||||||
<i class="fa-solid fa-gear"></i> ABOUT PAGE
|
|
||||||
</button>
|
|
||||||
<hr />
|
|
||||||
<button class="w-100 btn btn-danger">
|
|
||||||
<i class="fa-solid fa-right-from-bracket"></i> LOGOUT
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-3"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
public int Height { get; set; } = 0;
|
|
||||||
public int Width { get; set; } = 0;
|
|
||||||
public string currIpv4 { get; set; } = "";
|
|
||||||
|
|
||||||
public class WindowDimension
|
|
||||||
{
|
|
||||||
public int Width { get; set; }
|
|
||||||
public int Height { get; set; }
|
|
||||||
}
|
|
||||||
protected async override Task OnAfterRenderAsync(bool firstRender)
|
|
||||||
{
|
|
||||||
//await Task.Delay(500);
|
|
||||||
if (firstRender)
|
|
||||||
{
|
|
||||||
await getWDim();
|
|
||||||
StateHasChanged();
|
|
||||||
Log.Debug($"Dimensioni schermo: {Width}x{Height}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
protected async override Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
await Task.Delay(1);
|
|
||||||
if (string.IsNullOrEmpty(currIpv4))
|
|
||||||
{
|
|
||||||
// ricalcolo e salvo...
|
|
||||||
if (httpContextAccessor.HttpContext != null)
|
|
||||||
{
|
|
||||||
var remoteIp = $"{httpContextAccessor.HttpContext.Connection?.RemoteIpAddress}";
|
|
||||||
// provo a recuperare ipV4...
|
|
||||||
currIpv4 = EgwCoreLib.Razor.Data.IpUtils.getLocalIpv4(remoteIp);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
protected async Task getWDim()
|
|
||||||
{
|
|
||||||
var dimension = await JSRuntime.InvokeAsync<WindowDimension>("getWindowDimensions");
|
|
||||||
Height = dimension.Height;
|
|
||||||
Width = dimension.Width;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
@page "/weather"
|
|
||||||
@attribute [StreamRendering(true)]
|
|
||||||
|
|
||||||
<PageTitle>Weather</PageTitle>
|
|
||||||
|
|
||||||
<h1>Weather</h1>
|
|
||||||
|
|
||||||
<p>This component demonstrates showing data from the server.</p>
|
|
||||||
|
|
||||||
@if (forecasts == null)
|
|
||||||
{
|
|
||||||
<p><em>Loading...</em></p>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<table class="table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>Date</th>
|
|
||||||
<th>Temp. (C)</th>
|
|
||||||
<th>Temp. (F)</th>
|
|
||||||
<th>Summary</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
@foreach (var forecast in forecasts)
|
|
||||||
{
|
|
||||||
<tr>
|
|
||||||
<td>@forecast.Date.ToShortDateString()</td>
|
|
||||||
<td>@forecast.TemperatureC</td>
|
|
||||||
<td>@forecast.TemperatureF</td>
|
|
||||||
<td>@forecast.Summary</td>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private WeatherForecast[]? forecasts;
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
// Simulate asynchronous loading to demonstrate streaming rendering
|
|
||||||
await Task.Delay(500);
|
|
||||||
|
|
||||||
var startDate = DateOnly.FromDateTime(DateTime.Now);
|
|
||||||
var summaries = new[] { "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" };
|
|
||||||
forecasts = Enumerable.Range(1, 5).Select(index => new WeatherForecast
|
|
||||||
{
|
|
||||||
Date = startDate.AddDays(index),
|
|
||||||
TemperatureC = Random.Shared.Next(-20, 55),
|
|
||||||
Summary = summaries[Random.Shared.Next(summaries.Length)]
|
|
||||||
}).ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
private class WeatherForecast
|
|
||||||
{
|
|
||||||
public DateOnly Date { get; set; }
|
|
||||||
public int TemperatureC { get; set; }
|
|
||||||
public string? Summary { get; set; }
|
|
||||||
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="new[] { typeof(Client._Imports).Assembly }">
|
|
||||||
<Found Context="routeData">
|
|
||||||
<RouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)" />
|
|
||||||
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
|
|
||||||
</Found>
|
|
||||||
</Router>
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
@using System.Net.Http
|
|
||||||
@using System.Net.Http.Json
|
|
||||||
@using Microsoft.AspNetCore.Components.Forms
|
|
||||||
@using Microsoft.AspNetCore.Components.Routing
|
|
||||||
@using Microsoft.AspNetCore.Components.Sections
|
|
||||||
@using Microsoft.AspNetCore.Components.Web
|
|
||||||
@using Microsoft.AspNetCore.Components.Web.Virtualization
|
|
||||||
@using Microsoft.JSInterop
|
|
||||||
@using MP.Data
|
|
||||||
@using MP.Data.DatabaseModels
|
|
||||||
@using MP.Data.DTO
|
|
||||||
@using MP.Data.Services
|
|
||||||
@using MP_TAB
|
|
||||||
@using MP_TAB.Components
|
|
||||||
@*
|
|
||||||
@using MP_TAB.Client.Components
|
|
||||||
@using MP_TAB.Client.Pages
|
|
||||||
*@
|
|
||||||
@@ -1,111 +0,0 @@
|
|||||||
using Microsoft.AspNetCore.Http;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using Microsoft.Extensions.Configuration;
|
|
||||||
using MP.Data.DatabaseModels;
|
|
||||||
using MP.Data.Services;
|
|
||||||
using NLog;
|
|
||||||
using NLog.Fluent;
|
|
||||||
using static System.Runtime.InteropServices.JavaScript.JSType;
|
|
||||||
|
|
||||||
namespace MP_TAB.Controllers
|
|
||||||
{
|
|
||||||
[Route("api/[controller]")]
|
|
||||||
[ApiController]
|
|
||||||
public class ListSelectController : ControllerBase
|
|
||||||
{
|
|
||||||
#region Public Constructors
|
|
||||||
|
|
||||||
public ListSelectController(IConfiguration configuration, ListSelectDataSrv DataService)
|
|
||||||
{
|
|
||||||
Log.Info("Starting ListSelectController");
|
|
||||||
_configuration = configuration;
|
|
||||||
CtrDataServ = DataService;
|
|
||||||
Log.Info("Avviato ListSelectController");
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Public Constructors
|
|
||||||
|
|
||||||
#region Public Methods
|
|
||||||
|
|
||||||
// GET: api/ListSelect
|
|
||||||
[HttpGet]
|
|
||||||
public string Get()
|
|
||||||
{
|
|
||||||
return "OK";
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpGet("GetArticoli")]
|
|
||||||
public async Task<List<AnagArticoli>> GetArticoli(string SearchArt, string Azienda = "*", int NumRec = 100000)
|
|
||||||
{
|
|
||||||
List<AnagArticoli> answ = new List<AnagArticoli>();
|
|
||||||
await Task.Delay(1);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
answ = await CtrDataServ.ArticoliGetSearch(NumRec, Azienda, SearchArt);
|
|
||||||
}
|
|
||||||
catch (Exception exc)
|
|
||||||
{
|
|
||||||
Log.Error($"Eccezione in GetArticoli | SearchArt: {SearchArt} | Azienda: {Azienda} | NumRec: {NumRec}{Environment.NewLine}{exc}");
|
|
||||||
}
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpGet("GetDictArticoli")]
|
|
||||||
public async Task<Dictionary<string, string>> GetDictArticoli(string SearchArt, string Azienda = "*", int NumRec = 100000)
|
|
||||||
{
|
|
||||||
Dictionary<string, string> answ = new Dictionary<string, string>();
|
|
||||||
await Task.Delay(1);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var rawData = await CtrDataServ.ArticoliGetSearch(NumRec, Azienda, SearchArt);
|
|
||||||
// trasformo!
|
|
||||||
if (rawData != null)
|
|
||||||
{
|
|
||||||
answ = rawData.ToDictionary(x => x.CodArticolo, x => $"{x.CodArticolo} | {x.DescArticolo} | {x.Disegno}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception exc)
|
|
||||||
{
|
|
||||||
Log.Error($"Eccezione in GetDictArticoli | SearchArt: {SearchArt} | Azienda: {Azienda} | NumRec: {NumRec}{Environment.NewLine}{exc}");
|
|
||||||
}
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpGet("GetDictMacc")]
|
|
||||||
public async Task<Dictionary<string, string>> GetDictMacc(int MatrOpr)
|
|
||||||
{
|
|
||||||
Dictionary<string, string> answ = new Dictionary<string, string>();
|
|
||||||
await Task.Delay(1);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var rawData = await CtrDataServ.MacchineByMatrOper(MatrOpr);
|
|
||||||
// trasformo!
|
|
||||||
if (rawData != null)
|
|
||||||
{
|
|
||||||
answ = rawData.ToDictionary(x => x.IdxMacchina, x => $"{x.IdxMacchina} | {x.Nome}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception exc)
|
|
||||||
{
|
|
||||||
Log.Error($"Eccezione in GetDictMacc | MatrOpr: {MatrOpr}{Environment.NewLine}{exc}");
|
|
||||||
}
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Public Methods
|
|
||||||
|
|
||||||
#region Private Fields
|
|
||||||
|
|
||||||
private static IConfiguration _configuration = null!;
|
|
||||||
|
|
||||||
private static Logger Log = LogManager.GetCurrentClassLogger();
|
|
||||||
|
|
||||||
#endregion Private Fields
|
|
||||||
|
|
||||||
#region Private Properties
|
|
||||||
|
|
||||||
private ListSelectDataSrv CtrDataServ { get; set; } = null!;
|
|
||||||
|
|
||||||
#endregion Private Properties
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
using Microsoft.AspNetCore.Http;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using Microsoft.Extensions.Configuration;
|
|
||||||
using MP.Data.DatabaseModels;
|
|
||||||
using MP.Data.Services;
|
|
||||||
using NLog;
|
|
||||||
using NLog.Fluent;
|
|
||||||
using static System.Runtime.InteropServices.JavaScript.JSType;
|
|
||||||
|
|
||||||
namespace MP_TAB.Controllers
|
|
||||||
{
|
|
||||||
[Route("api/[controller]")]
|
|
||||||
[ApiController]
|
|
||||||
public class ODLController : ControllerBase
|
|
||||||
{
|
|
||||||
#region Public Constructors
|
|
||||||
|
|
||||||
public ODLController(IConfiguration configuration, OrderDataSrv DataService)
|
|
||||||
{
|
|
||||||
Log.Info("Starting ODLController");
|
|
||||||
_configuration = configuration;
|
|
||||||
CtrDataServ = DataService;
|
|
||||||
Log.Trace("Avviato ODLController");
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Public Constructors
|
|
||||||
|
|
||||||
#region Public Methods
|
|
||||||
|
|
||||||
// GET: api/ListSelect
|
|
||||||
[HttpGet]
|
|
||||||
public string Get()
|
|
||||||
{
|
|
||||||
return "OK";
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpGet("GetODL")]
|
|
||||||
public async Task<List<ODLExpModel>> GetODL(string CodArt, string IdxMacchina)
|
|
||||||
{
|
|
||||||
List<ODLExpModel> answ = new List<ODLExpModel>();
|
|
||||||
await Task.Delay(1);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
answ = await CtrDataServ.ListODLFilt(CodArt, IdxMacchina);
|
|
||||||
}
|
|
||||||
catch (Exception exc)
|
|
||||||
{
|
|
||||||
Log.Error($"Eccezione in GetODL | CodArt: {CodArt} | IdxMacchina: {IdxMacchina}{Environment.NewLine}{exc}");
|
|
||||||
}
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Public Methods
|
|
||||||
|
|
||||||
#region Private Fields
|
|
||||||
|
|
||||||
private static IConfiguration _configuration = null!;
|
|
||||||
|
|
||||||
private static Logger Log = LogManager.GetCurrentClassLogger();
|
|
||||||
|
|
||||||
#endregion Private Fields
|
|
||||||
|
|
||||||
#region Private Properties
|
|
||||||
|
|
||||||
private OrderDataSrv CtrDataServ { get; set; } = null!;
|
|
||||||
|
|
||||||
#endregion Private Properties
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,137 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<RootNamespace>MP-TAB</RootNamespace>
|
|
||||||
<AssemblyName>$(AssemblyName.Replace(' ', '_'))</AssemblyName>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Content Remove="compilerconfig.json" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV001.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV002.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV003.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV004.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV005.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV006.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV008.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV009.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV010.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV011.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV012.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV013.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV014.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV015.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV062.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\FOV090.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV001.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV002.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV003.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV004.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV005.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV006.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV008.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV009.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV010.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV011.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV012.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV013.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV014.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV015.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV062.png" />
|
|
||||||
<Content Remove="wwwroot\images\macchine\small\FOV090.png" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS01.pubxml" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="compilerconfig.json" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\MP-TAB.Client\MP-TAB.Client.csproj" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-rc.1.23421.29" />
|
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
|
||||||
<PackageReference Include="StackExchange.Redis" Version="2.6.90" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Content Update="wwwroot\fonts\lato-v17-latin-regular.eot">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\lato-v17-latin-regular.svg">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\lato-v17-latin-regular.ttf">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\lato-v17-latin-regular.woff">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\lato-v17-latin-regular.woff2">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\OpenSans.woff">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\OpenSansCondensed.woff">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\roboto-condensed-v19-latin-regular.eot">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\roboto-condensed-v19-latin-regular.svg">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\roboto-condensed-v19-latin-regular.ttf">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\roboto-condensed-v19-latin-regular.woff">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\roboto-condensed-v19-latin-regular.woff2">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\roboto-v27-latin-regular.eot">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\roboto-v27-latin-regular.svg">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\roboto-v27-latin-regular.ttf">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\roboto-v27-latin-regular.woff">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\fonts\roboto-v27-latin-regular.woff2">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\images\favicon.ico">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\images\favicon.png">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\images\macchine\small\Steamware.png">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Update="wwwroot\images\macchine\Steamware.png">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<None Update="logs\.placeholder">
|
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
|
||||||
</None>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<Folder Include="Data\" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
|
|
||||||
autoReload="true"
|
|
||||||
throwExceptions="false"
|
|
||||||
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
|
|
||||||
|
|
||||||
<!-- optional, add some variables
|
|
||||||
https://github.com/nlog/NLog/wiki/Configuration-file#variables
|
|
||||||
-->
|
|
||||||
<variable name="myvar" value="myvalue" />
|
|
||||||
|
|
||||||
<!--
|
|
||||||
See https://github.com/nlog/nlog/wiki/Configuration-file
|
|
||||||
for information on customizing logging rules and outputs.
|
|
||||||
-->
|
|
||||||
<targets>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
add your targets here
|
|
||||||
See https://github.com/nlog/NLog/wiki/Targets for possible targets.
|
|
||||||
See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Write events to a file with the date in the filename.
|
|
||||||
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
|
|
||||||
layout="${longdate} ${uppercase:${level}} ${message}" />
|
|
||||||
-->
|
|
||||||
<target xsi:type="File" name="fileTarget" fileName="${basedir}/logs/${shortdate}.log" layout="${longdate} | ${uppercase:${level}} | ${logger:shortName=false} | ${message}" />
|
|
||||||
<target xsi:type="ColoredConsole" name="consoleTarget" layout="${longdate} | ${uppercase:${level}} | ${logger:shortName=true} | ${message}" />
|
|
||||||
</targets>
|
|
||||||
|
|
||||||
<rules>
|
|
||||||
<!-- add your logging rules here -->
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f"
|
|
||||||
<logger name="*" minlevel="Debug" writeTo="f" />
|
|
||||||
-->
|
|
||||||
<logger name="*" minlevel="Debug" writeTo="consoleTarget" />
|
|
||||||
<!--<logger name="Microsoft.*" maxlevel="Info" final="true" />-->
|
|
||||||
<logger name="*" minlevel="Info" writeTo="fileTarget" />
|
|
||||||
</rules>
|
|
||||||
</nlog>
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
using MP_TAB.Components;
|
|
||||||
using MP.Data.Services;
|
|
||||||
using StackExchange.Redis;
|
|
||||||
using Microsoft.Net.Http.Headers;
|
|
||||||
using MP_TAB.Data;
|
|
||||||
using Blazored.LocalStorage;
|
|
||||||
using Blazored.SessionStorage;
|
|
||||||
|
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
|
||||||
ConfigurationManager configuration = builder.Configuration;
|
|
||||||
// REDIS setup
|
|
||||||
var cString = configuration.GetConnectionString("Redis");
|
|
||||||
string connStringRedis = cString ?? "localhost:6379, DefaultDatabase=1, connectTimeout=5000, syncTimeout=5000, asyncTimeout=5000, abortConnect=false, ssl=false";
|
|
||||||
//string redisSrvAddr = connStringRedis.Substring(0, connStringRedis.IndexOf(":"));
|
|
||||||
// avvio oggetto shared x redis...
|
|
||||||
var redisMultiplexer = ConnectionMultiplexer.Connect(connStringRedis);
|
|
||||||
|
|
||||||
// Add services x accesso dati
|
|
||||||
builder.Services.AddSingleton<IConnectionMultiplexer>(redisMultiplexer);
|
|
||||||
builder.Services.AddSingleton<StatusData>();
|
|
||||||
builder.Services.AddSingleton<ListSelectDataSrv>();
|
|
||||||
builder.Services.AddSingleton<OrderDataSrv>();
|
|
||||||
builder.Services.AddSingleton<SharedMemService>();
|
|
||||||
builder.Services.AddScoped<MessageService>();
|
|
||||||
builder.Services.AddBlazoredLocalStorage();
|
|
||||||
builder.Services.AddBlazoredSessionStorage();
|
|
||||||
|
|
||||||
|
|
||||||
builder.Services.AddHttpContextAccessor();
|
|
||||||
|
|
||||||
// nuova versione contenuti...
|
|
||||||
builder.Services.AddRazorComponents()
|
|
||||||
.AddServerComponents()
|
|
||||||
.AddWebAssemblyComponents();
|
|
||||||
// controller API
|
|
||||||
builder.Services.AddControllers();
|
|
||||||
// HTTP client x accesso a WebAPI
|
|
||||||
builder.Services.AddHttpClient();
|
|
||||||
|
|
||||||
// costruisco app
|
|
||||||
var app = builder.Build();
|
|
||||||
|
|
||||||
// aggiunt base URL x routing corretto
|
|
||||||
app.UsePathBase(configuration["OptConf:BaseUrl"]);
|
|
||||||
app.UseAntiforgery();
|
|
||||||
|
|
||||||
// Configure the HTTP request pipeline.
|
|
||||||
if (app.Environment.IsDevelopment())
|
|
||||||
{
|
|
||||||
app.UseWebAssemblyDebugging();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
app.UseExceptionHandler("/Error");
|
|
||||||
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
|
|
||||||
app.UseHsts();
|
|
||||||
}
|
|
||||||
|
|
||||||
app.UseHttpsRedirection();
|
|
||||||
|
|
||||||
app.UseStaticFiles();
|
|
||||||
|
|
||||||
app.MapRazorComponents<App>()
|
|
||||||
.AddServerRenderMode()
|
|
||||||
.AddWebAssemblyRenderMode();
|
|
||||||
|
|
||||||
app.MapControllers();
|
|
||||||
|
|
||||||
app.Run();
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "http://json.schemastore.org/launchsettings.json",
|
|
||||||
"iisSettings": {
|
|
||||||
"windowsAuthentication": false,
|
|
||||||
"anonymousAuthentication": true,
|
|
||||||
"iisExpress": {
|
|
||||||
"applicationUrl": "http://localhost:1682",
|
|
||||||
"sslPort": 44365
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"profiles": {
|
|
||||||
"http": {
|
|
||||||
"commandName": "Project",
|
|
||||||
"dotnetRunMessages": true,
|
|
||||||
"launchBrowser": true,
|
|
||||||
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
|
|
||||||
"applicationUrl": "http://localhost:5101",
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"https": {
|
|
||||||
"commandName": "Project",
|
|
||||||
"dotnetRunMessages": true,
|
|
||||||
"launchBrowser": true,
|
|
||||||
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
|
|
||||||
"applicationUrl": "https://localhost:7057;http://localhost:5101",
|
|
||||||
"launchUrl": "https://localhost:7057/MP/TAB2",
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"IIS Express": {
|
|
||||||
"commandName": "IISExpress",
|
|
||||||
"launchBrowser": true,
|
|
||||||
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"Logging": {
|
|
||||||
"LogLevel": {
|
|
||||||
"Default": "Information",
|
|
||||||
"Microsoft.AspNetCore": "Warning"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
{
|
|
||||||
"Logging": {
|
|
||||||
"LogLevel": {
|
|
||||||
"Default": "Information",
|
|
||||||
"Microsoft.AspNetCore": "Warning"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"OptConf": {
|
|
||||||
"BaseAddr": "https://iis01.egalware.com/MP/TAB2/",
|
|
||||||
"BaseUrl": "/MP/TAB2",
|
|
||||||
"ImgBasePath": "C:\\Steamware\\macchine"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
{
|
|
||||||
"Logging": {
|
|
||||||
"LogLevel": {
|
|
||||||
"Default": "Information",
|
|
||||||
"Microsoft.AspNetCore": "Warning"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"AllowedHosts": "*",
|
|
||||||
"CodApp": "MP.TAB",
|
|
||||||
"ConnectionStrings": {
|
|
||||||
"Redis": "localhost:6379,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false",
|
|
||||||
"MP.All": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
|
|
||||||
"MP.Mon": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
|
|
||||||
"MP.Tab": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;"
|
|
||||||
},
|
|
||||||
"ServerConf": {
|
|
||||||
"maxAge": "2000"
|
|
||||||
},
|
|
||||||
"OptConf": {
|
|
||||||
"BaseAddr": "https://localhost:7057/MP/TAB2/",
|
|
||||||
"BaseUrl": "/MP/TAB2",
|
|
||||||
"ImgBasePath": "C:\\Steamware\\macchine"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"outputFile": "wwwroot/app.css",
|
|
||||||
"inputFile": "wwwroot/app.less"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"outputFile": "wwwroot/font.css",
|
|
||||||
"inputFile": "wwwroot/font.less"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
"version": "1.0",
|
|
||||||
"defaultProvider": "cdnjs",
|
|
||||||
"libraries": [
|
|
||||||
{
|
|
||||||
"library": "font-awesome@6.4.2",
|
|
||||||
"destination": "wwwroot/lib/font-awesome/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"library": "bootstrap@5.3.2",
|
|
||||||
"destination": "wwwroot/lib/bootstrap/"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
html,
|
|
||||||
body {
|
|
||||||
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
|
|
||||||
background-image: linear-gradient(#444, #222);
|
|
||||||
color: #EDEDED;
|
|
||||||
}
|
|
||||||
h1:focus {
|
|
||||||
outline: none;
|
|
||||||
}
|
|
||||||
a,
|
|
||||||
.btn-link {
|
|
||||||
color: #0071c1;
|
|
||||||
}
|
|
||||||
.btn-primary {
|
|
||||||
color: #fff;
|
|
||||||
background-color: #1b6ec2;
|
|
||||||
border-color: #1861ac;
|
|
||||||
}
|
|
||||||
.btn:focus,
|
|
||||||
.btn:active:focus,
|
|
||||||
.btn-link.nav-link:focus,
|
|
||||||
.form-control:focus,
|
|
||||||
.form-check-input:focus {
|
|
||||||
box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb;
|
|
||||||
}
|
|
||||||
.content {
|
|
||||||
padding-top: 1.1rem;
|
|
||||||
}
|
|
||||||
.valid.modified:not([type=checkbox]) {
|
|
||||||
outline: 1px solid #26b050;
|
|
||||||
}
|
|
||||||
.invalid {
|
|
||||||
outline: 1px solid red;
|
|
||||||
}
|
|
||||||
.validation-message {
|
|
||||||
color: red;
|
|
||||||
}
|
|
||||||
.blazor-error-boundary {
|
|
||||||
background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
|
|
||||||
padding: 1rem 1rem 1rem 3.7rem;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
.blazor-error-boundary::after {
|
|
||||||
content: "An error has occurred.";
|
|
||||||
}
|
|
||||||
td {
|
|
||||||
font-size: 0.7rem;
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
html, body {
|
|
||||||
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
|
|
||||||
background-image: linear-gradient(#444,#222);
|
|
||||||
color: #EDEDED;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1:focus {
|
|
||||||
outline: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
a, .btn-link {
|
|
||||||
color: #0071c1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-primary {
|
|
||||||
color: #fff;
|
|
||||||
background-color: #1b6ec2;
|
|
||||||
border-color: #1861ac;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus {
|
|
||||||
box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content {
|
|
||||||
padding-top: 1.1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.valid.modified:not([type=checkbox]) {
|
|
||||||
outline: 1px solid #26b050;
|
|
||||||
}
|
|
||||||
|
|
||||||
.invalid {
|
|
||||||
outline: 1px solid red;
|
|
||||||
}
|
|
||||||
|
|
||||||
.validation-message {
|
|
||||||
color: red;
|
|
||||||
}
|
|
||||||
|
|
||||||
.blazor-error-boundary {
|
|
||||||
background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
|
|
||||||
padding: 1rem 1rem 1rem 3.7rem;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.blazor-error-boundary::after {
|
|
||||||
content: "An error has occurred."
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
td{
|
|
||||||
font-size: .7rem;
|
|
||||||
}
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
html,body{font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-image:linear-gradient(#444,#222);color:#ededed;}h1:focus{outline:0;}a,.btn-link{color:#0071c1;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.btn:focus,.btn:active:focus,.btn-link.nav-link:focus,.form-control:focus,.form-check-input:focus{box-shadow:0 0 0 .1rem white,0 0 0 .25rem #258cfb;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}.blazor-error-boundary{background:url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem,#b32121;padding:1rem 1rem 1rem 3.7rem;color:#fff;}.blazor-error-boundary::after{content:"An error has occurred.";}td{font-size:.7rem;}
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,42 +0,0 @@
|
|||||||
@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: url('fonts/OpenSans.woff') format('woff');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans Condensed';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 300;
|
|
||||||
src: url('fonts/OpenSansCondensed.woff') format('woff');
|
|
||||||
}
|
|
||||||
/* lato-regular - latin */
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Lato';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: url('../fonts/lato-v17-latin-regular.eot');
|
|
||||||
/* IE9 Compat Modes */
|
|
||||||
src: local(''), url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/lato-v17-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/lato-v17-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/lato-v17-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg');
|
|
||||||
/* Legacy iOS */
|
|
||||||
}
|
|
||||||
/* roboto-regular - latin */
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Roboto';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: url('../fonts/roboto-v27-latin-regular.eot');
|
|
||||||
/* IE9 Compat Modes */
|
|
||||||
src: local(''), url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/roboto-v27-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg');
|
|
||||||
/* Legacy iOS */
|
|
||||||
}
|
|
||||||
/* roboto-condensed-regular - latin */
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Roboto Condensed';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: url('../fonts/roboto-condensed-v19-latin-regular.eot');
|
|
||||||
/* IE9 Compat Modes */
|
|
||||||
src: local(''), url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg');
|
|
||||||
/* Legacy iOS */
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
@font-face {
|
|
||||||
font-family: 'Open Sans';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: url('fonts/OpenSans.woff') format('woff');
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Open Sans Condensed';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 300;
|
|
||||||
src: url('fonts/OpenSansCondensed.woff') format('woff');
|
|
||||||
}
|
|
||||||
|
|
||||||
/* lato-regular - latin */
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Lato';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: url('../fonts/lato-v17-latin-regular.eot'); /* IE9 Compat Modes */
|
|
||||||
src: local(''), url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
|
|
||||||
url('../fonts/lato-v17-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
|
|
||||||
url('../fonts/lato-v17-latin-regular.woff') format('woff'), /* Modern Browsers */
|
|
||||||
url('../fonts/lato-v17-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
|
|
||||||
url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg'); /* Legacy iOS */
|
|
||||||
}
|
|
||||||
/* roboto-regular - latin */
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Roboto';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: url('../fonts/roboto-v27-latin-regular.eot'); /* IE9 Compat Modes */
|
|
||||||
src: local(''), url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
|
|
||||||
url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
|
|
||||||
url('../fonts/roboto-v27-latin-regular.woff') format('woff'), /* Modern Browsers */
|
|
||||||
url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
|
|
||||||
url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */
|
|
||||||
}
|
|
||||||
/* roboto-condensed-regular - latin */
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Roboto Condensed';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: url('../fonts/roboto-condensed-v19-latin-regular.eot'); /* IE9 Compat Modes */
|
|
||||||
src: local(''), url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
|
|
||||||
url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
|
|
||||||
url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'), /* Modern Browsers */
|
|
||||||
url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
|
|
||||||
url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg'); /* Legacy iOS */
|
|
||||||
}
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('fonts/OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('fonts/OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Lato';font-style:normal;font-weight:400;src:url('../fonts/lato-v17-latin-regular.eot?');src:local(''),url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/lato-v17-latin-regular.woff2') format('woff2'),url('../fonts/lato-v17-latin-regular.woff') format('woff'),url('../fonts/lato-v17-latin-regular.ttf') format('truetype'),url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('../fonts/roboto-v27-latin-regular.eot?');src:local(''),url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'),url('../fonts/roboto-v27-latin-regular.woff') format('woff'),url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'),url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;src:url('../fonts/roboto-condensed-v19-latin-regular.eot?');src:local(''),url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'),url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'),url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'),url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg');}
|
|
||||||
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user