diff --git a/application/src/main/data/json/system/widget_bundles/control_widgets.json b/application/src/main/data/json/system/widget_bundles/control_widgets.json index 568a144874..560063a2c4 100644 --- a/application/src/main/data/json/system/widget_bundles/control_widgets.json +++ b/application/src/main/data/json/system/widget_bundles/control_widgets.json @@ -11,6 +11,7 @@ "single_switch", "command_button", "power_button", + "slider", "control_widgets.switch_control", "control_widgets.slide_toggle_control", "control_widgets.round_switch", diff --git a/application/src/main/data/json/system/widget_types/progress_bar.json b/application/src/main/data/json/system/widget_types/progress_bar.json index 1a92b6d470..6e60c20942 100644 --- a/application/src/main/data/json/system/widget_types/progress_bar.json +++ b/application/src/main/data/json/system/widget_types/progress_bar.json @@ -2,7 +2,7 @@ "fqn": "progress_bar", "name": "Progress bar", "deprecated": false, - "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAAeFBMVEXg4ODf39/g4ODg4OAAAAD////g4OD19fUhISE/Ut3j4+OsrKzHx8eQkJB0dHQ8PDzx8fEvLy+6urrV1dWCgoJYWFienp5KSkrv7++GhoZmZmaXl5f39/epqanLy8vCwsL29vZtfORiceJ+fn7m5ubU1NTn6fve4fIbcz38AAAABXRSTlPvIL+vAC9A4IoAAASZSURBVHja7d0NT9swEIDhMji4nb/jxEk/NmCM7f//w/niQLtJyxamtdfiF6EmDkh+1Di0IojVzdWH1e25d311s7paDXD2+cy49nABDfm0gotodSmQ2woRVoVIq0KkVSHSqhBpVYi0KkRaFSKtGUijctrDv6XQwEzHgDjkXLoAiKaoAurzhxAAGGxBm2gMgE+25SHeUNE0QKbRNo/otlWQo2QNQa6xrdpD1DSqW6vyBhmtrD86RKHNGIcOyOUHZJDDEEIe1xgQdT487gGF0CNmgUXnsH+BhPzhCKDFfNh50OgQ6dgQv0HFEB2hw8QYDQo3HlqGZFf0066GDiNQFmvcMEZNEMdH2zza8WhivopwVEjX9QF7yBCVSbwFCc04YdBoy4xhkw3QYAsWjQciiNhH8OT3a8RnXo4ooRm/M3dMSN91m+QnCM+6zN9h2ShTyq4xy08X9mpcVxgswR4yfktymDsJhICbIPEA4n+GJJXTfNS48atIWQzxABKQl0YEJQDiQ/Dl1LeoDyHtONWYj41TDtDYvJMwTZA2w7ADwwNJAAQS9sqgY4NLyb1CKGCrGNeh0QY7Pq6bHvUEQaMcKh5VJkiAgAmIHfGGw7B5hQD1iMHkR4vlC5TLA+l1jeS9dlo5LdojQeYj/7rBp8xrnvz+kSOCg349WjolpES9itphBEm9BeI3OJ46omLI8qhppP2e6z28sTqvKkRaFSKtCpFWhUirQqRVIdKqEGlViLQqRFoVIq0KkVaFSKtCpFUh0qoQaVWItCpEWhUirQqR1jzER609HEbSbhT4G4g3AXOWYKrpAnYgszlIjyVXJNTl7XOEJMQ+ArXT5L3LpBQJZDYD6RGJAQED5DKoBbnN3uTfvIAAgBB7EFyBzBbQlXsTNV/EQGh/hPgWUZW7e1PglR+hJOw6PA/RfCs2Gsg5nApFYvtO1L2A8xC1n3ne6DWQRewKEfQGSM7FeB5CSrUOUY0QN13D0DPEQuzANiAlhsxHAYNnSA9ci6gZ5Jq2VRbEVCCzWcRYrl2cKRAgk6gT9NPx9xBvbTqYeofBTyz9IlTaiDm3Zp6RckoxAePIScxzGKBEPTnVK5DRDMS+vtZyLMguBbTZv1BxpAw0UpbJDMQ7LAWCXIMl52EsGVAtKCmvv2YgQNYxY0PTbs97xh9SN07KemfITFHHw4nzntA3jO/kPfsZVSHSqhBpVYi0KkRaFSKtCpHWO4B8e/y4rC/f7/5/D8shXz4u7fHuCO0WQz4u7+4YLYY8LnZ8uTtCu+VrZOm59XiMNbJ7x1etM6tCpFUh0qoQac1A7s325L+P2t1/AoBhu90O04SWQ4b1ANsTP10Pa7XOD5/u4fMWbte74WlYDnlOAM3Jn5KBIesBHp7gXmXS5+WQz5/EQOz42TQVIgWyHgDyqfVGyPD0AOkZThxD+JrznBf7NpO+LodAszZbOHEF8nW9ZYEyZvnll9vtQErDNKH3/ZP9vKoQaVWItCpEWhUirQqRVoVIq0KkVSHSqhBpVYi0LgiygovodvXhAv71NIC/Xl2txPzpxNsbMuPm6vr23Ft9uLr5AdpbpSAPQyy7AAAAAElFTkSuQmCC", + "image": "tb-image:cHJvZ3Jlc3NfYmFyX3N5c3RlbV93aWRnZXRfaW1hZ2UucG5n:IlByb2dyZXNzIGJhciIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4685_40989)">
<rect width="200" height="160" rx="4" fill="white"/>
<g filter="url(#filter0_d_4685_40989)">
<rect width="200" height="160" rx="4" fill="white" shape-rendering="crispEdges"/>
<g filter="url(#filter1_b_4685_40989)">
<rect x="12" y="12" width="176" height="136" rx="4" fill="white" fill-opacity="0.76"/>
</g>
<path d="M16.4497 19.5532H14.0439V18.29H16.4497C16.8687 18.29 17.2072 18.2223 17.4653 18.0869C17.7235 17.9515 17.9118 17.7653 18.0303 17.5283C18.153 17.2871 18.2144 17.012 18.2144 16.7031C18.2144 16.4111 18.153 16.1382 18.0303 15.8843C17.9118 15.6261 17.7235 15.4188 17.4653 15.2622C17.2072 15.1056 16.8687 15.0273 16.4497 15.0273H14.5327V23H12.9395V13.7578H16.4497C17.1649 13.7578 17.7721 13.8848 18.2715 14.1387C18.7751 14.3883 19.158 14.7354 19.4204 15.1797C19.6828 15.6198 19.814 16.1234 19.814 16.6904C19.814 17.2871 19.6828 17.7992 19.4204 18.2266C19.158 18.654 18.7751 18.9819 18.2715 19.2104C17.7721 19.439 17.1649 19.5532 16.4497 19.5532ZM22.876 17.4395V23H21.3462V16.1318H22.8062L22.876 17.4395ZM24.9771 16.0874L24.9644 17.5093C24.8713 17.4924 24.7697 17.4797 24.6597 17.4712C24.5539 17.4627 24.4481 17.4585 24.3423 17.4585C24.0799 17.4585 23.8493 17.4966 23.6504 17.5728C23.4515 17.6447 23.2843 17.7505 23.1489 17.8901C23.0177 18.0256 22.9162 18.1906 22.8442 18.3853C22.7723 18.5799 22.73 18.7979 22.7173 19.0391L22.3682 19.0645C22.3682 18.6328 22.4105 18.2329 22.4951 17.8647C22.5798 17.4966 22.7067 17.1729 22.876 16.8936C23.0495 16.6143 23.2653 16.3963 23.5234 16.2397C23.7858 16.0832 24.0884 16.0049 24.4312 16.0049C24.5243 16.0049 24.6237 16.0133 24.7295 16.0303C24.8395 16.0472 24.922 16.0662 24.9771 16.0874ZM25.7285 19.6421V19.4961C25.7285 19.001 25.8005 18.5418 25.9443 18.1187C26.0882 17.6912 26.2956 17.321 26.5664 17.0078C26.8415 16.6904 27.1758 16.445 27.5693 16.2715C27.9671 16.0938 28.4157 16.0049 28.915 16.0049C29.4186 16.0049 29.8672 16.0938 30.2607 16.2715C30.6585 16.445 30.995 16.6904 31.27 17.0078C31.5451 17.321 31.7546 17.6912 31.8984 18.1187C32.0423 18.5418 32.1143 19.001 32.1143 19.4961V19.6421C32.1143 20.1372 32.0423 20.5964 31.8984 21.0195C31.7546 21.4427 31.5451 21.813 31.27 22.1304C30.995 22.4435 30.6606 22.689 30.2671 22.8667C29.8735 23.0402 29.4271 23.127 28.9277 23.127C28.4242 23.127 27.9735 23.0402 27.5757 22.8667C27.1821 22.689 26.8478 22.4435 26.5728 22.1304C26.2977 21.813 26.0882 21.4427 25.9443 21.0195C25.8005 20.5964 25.7285 20.1372 25.7285 19.6421ZM27.2583 19.4961V19.6421C27.2583 19.951 27.29 20.243 27.3535 20.5181C27.417 20.7931 27.5164 21.0343 27.6519 21.2417C27.7873 21.4491 27.9608 21.612 28.1724 21.7305C28.384 21.849 28.6357 21.9082 28.9277 21.9082C29.2113 21.9082 29.4567 21.849 29.6641 21.7305C29.8757 21.612 30.0492 21.4491 30.1846 21.2417C30.32 21.0343 30.4194 20.7931 30.4829 20.5181C30.5506 20.243 30.5845 19.951 30.5845 19.6421V19.4961C30.5845 19.1914 30.5506 18.9036 30.4829 18.6328C30.4194 18.3577 30.3179 18.1144 30.1782 17.9028C30.0428 17.6912 29.8693 17.5262 29.6577 17.4077C29.4504 17.285 29.2028 17.2236 28.915 17.2236C28.6273 17.2236 28.3776 17.285 28.166 17.4077C27.9587 17.5262 27.7873 17.6912 27.6519 17.9028C27.5164 18.1144 27.417 18.3577 27.3535 18.6328C27.29 18.9036 27.2583 19.1914 27.2583 19.4961ZM38.0454 16.1318H39.4355V22.8096C39.4355 23.4274 39.3044 23.9521 39.042 24.3838C38.7796 24.8154 38.4136 25.1434 37.9438 25.3677C37.4741 25.5962 36.9303 25.7104 36.3125 25.7104C36.0501 25.7104 35.7581 25.6724 35.4365 25.5962C35.1191 25.52 34.8102 25.3973 34.5098 25.228C34.2135 25.063 33.966 24.8451 33.7671 24.5742L34.4844 23.6729C34.7298 23.9648 35.0007 24.1785 35.2969 24.314C35.5931 24.4494 35.9041 24.5171 36.23 24.5171C36.5812 24.5171 36.8796 24.4515 37.125 24.3203C37.3747 24.1934 37.5672 24.005 37.7026 23.7554C37.8381 23.5057 37.9058 23.201 37.9058 22.8413V17.687L38.0454 16.1318ZM33.3799 19.6421V19.5088C33.3799 18.9883 33.4434 18.5143 33.5703 18.0869C33.6973 17.6553 33.8792 17.285 34.1162 16.9761C34.3532 16.6629 34.641 16.4238 34.9795 16.2588C35.318 16.0895 35.701 16.0049 36.1284 16.0049C36.5728 16.0049 36.9515 16.0853 37.2646 16.2461C37.582 16.4069 37.8465 16.6375 38.0581 16.938C38.2697 17.2342 38.4347 17.5897 38.5532 18.0044C38.6759 18.4149 38.7669 18.8719 38.8262 19.3755V19.8008C38.7712 20.2917 38.6781 20.7402 38.5469 21.1465C38.4157 21.5527 38.2422 21.904 38.0264 22.2002C37.8105 22.4964 37.5439 22.7249 37.2266 22.8857C36.9134 23.0465 36.5431 23.127 36.1157 23.127C35.6968 23.127 35.318 23.0402 34.9795 22.8667C34.6452 22.6932 34.3574 22.4499 34.1162 22.1367C33.8792 21.8236 33.6973 21.4554 33.5703 21.0322C33.4434 20.6048 33.3799 20.1414 33.3799 19.6421ZM34.9097 19.5088V19.6421C34.9097 19.9552 34.9393 20.2472 34.9985 20.5181C35.062 20.7889 35.1572 21.028 35.2842 21.2354C35.4154 21.4385 35.5804 21.5993 35.7793 21.7178C35.9824 21.832 36.2215 21.8892 36.4966 21.8892C36.8563 21.8892 37.1504 21.813 37.3789 21.6606C37.6117 21.5083 37.7894 21.3031 37.9121 21.0449C38.0391 20.7826 38.1279 20.4906 38.1787 20.1689V19.02C38.1533 18.7703 38.1004 18.5376 38.02 18.3218C37.9438 18.106 37.8402 17.9176 37.709 17.7568C37.5778 17.5918 37.4128 17.4648 37.2139 17.376C37.015 17.2829 36.7801 17.2363 36.5093 17.2363C36.2342 17.2363 35.9951 17.2956 35.792 17.4141C35.5889 17.5326 35.4217 17.6955 35.2905 17.9028C35.1636 18.1102 35.0684 18.3514 35.0049 18.6265C34.9414 18.9015 34.9097 19.1956 34.9097 19.5088ZM42.8086 17.4395V23H41.2788V16.1318H42.7388L42.8086 17.4395ZM44.9097 16.0874L44.897 17.5093C44.8039 17.4924 44.7023 17.4797 44.5923 17.4712C44.4865 17.4627 44.3807 17.4585 44.2749 17.4585C44.0125 17.4585 43.7819 17.4966 43.583 17.5728C43.3841 17.6447 43.217 17.7505 43.0815 17.8901C42.9504 18.0256 42.8488 18.1906 42.7769 18.3853C42.7049 18.5799 42.6626 18.7979 42.6499 19.0391L42.3008 19.0645C42.3008 18.6328 42.3431 18.2329 42.4277 17.8647C42.5124 17.4966 42.6393 17.1729 42.8086 16.8936C42.9821 16.6143 43.1979 16.3963 43.4561 16.2397C43.7184 16.0832 44.021 16.0049 44.3638 16.0049C44.4569 16.0049 44.5563 16.0133 44.6621 16.0303C44.7721 16.0472 44.8547 16.0662 44.9097 16.0874ZM49.019 23.127C48.5112 23.127 48.0521 23.0444 47.6416 22.8794C47.2354 22.7101 46.8883 22.4753 46.6006 22.1748C46.3171 21.8743 46.0991 21.521 45.9468 21.1147C45.7944 20.7085 45.7183 20.2705 45.7183 19.8008V19.5469C45.7183 19.0094 45.7965 18.5228 45.9531 18.0869C46.1097 17.651 46.3276 17.2786 46.6069 16.9697C46.8862 16.6566 47.2163 16.4175 47.5972 16.2524C47.978 16.0874 48.3906 16.0049 48.835 16.0049C49.3258 16.0049 49.7554 16.0874 50.1235 16.2524C50.4917 16.4175 50.7964 16.6502 51.0376 16.9507C51.283 17.2469 51.465 17.6003 51.5835 18.0107C51.7062 18.4212 51.7676 18.874 51.7676 19.3691V20.0229H46.4609V18.9248H50.2568V18.8042C50.2484 18.5291 50.1934 18.271 50.0918 18.0298C49.9945 17.7886 49.8442 17.5939 49.6411 17.4458C49.438 17.2977 49.1672 17.2236 48.8286 17.2236C48.5747 17.2236 48.3483 17.2786 48.1494 17.3887C47.9548 17.4945 47.7918 17.6489 47.6606 17.8521C47.5295 18.0552 47.4279 18.3006 47.356 18.5884C47.2882 18.8719 47.2544 19.1914 47.2544 19.5469V19.8008C47.2544 20.1012 47.2946 20.3805 47.375 20.6387C47.4596 20.8926 47.5824 21.1147 47.7432 21.3052C47.904 21.4956 48.0986 21.6458 48.3271 21.7559C48.5557 21.8617 48.8159 21.9146 49.1079 21.9146C49.4761 21.9146 49.804 21.8405 50.0918 21.6924C50.3796 21.5443 50.6292 21.3348 50.8408 21.064L51.647 21.8447C51.4989 22.0605 51.3063 22.2679 51.0693 22.4668C50.8324 22.6615 50.5425 22.8201 50.1997 22.9429C49.8612 23.0656 49.4676 23.127 49.019 23.127ZM57.064 21.1401C57.064 20.9878 57.0259 20.8503 56.9497 20.7275C56.8735 20.6006 56.7275 20.4863 56.5117 20.3848C56.3001 20.2832 55.987 20.1901 55.5723 20.1055C55.2083 20.0251 54.874 19.9299 54.5693 19.8198C54.2689 19.7056 54.0107 19.568 53.7949 19.4072C53.5791 19.2464 53.4119 19.056 53.2935 18.8359C53.175 18.6159 53.1157 18.362 53.1157 18.0742C53.1157 17.7949 53.1771 17.5304 53.2998 17.2808C53.4225 17.0311 53.5981 16.811 53.8267 16.6206C54.0552 16.4302 54.3324 16.2799 54.6582 16.1699C54.9883 16.0599 55.3564 16.0049 55.7627 16.0049C56.3382 16.0049 56.8312 16.1022 57.2417 16.2969C57.6564 16.4873 57.9738 16.7476 58.1938 17.0776C58.4139 17.4035 58.5239 17.7716 58.5239 18.1821H56.9941C56.9941 18.0002 56.9476 17.8309 56.8545 17.6743C56.7656 17.5135 56.6302 17.3844 56.4482 17.2871C56.2663 17.1855 56.0378 17.1348 55.7627 17.1348C55.5003 17.1348 55.2824 17.1771 55.1089 17.2617C54.9396 17.3421 54.8127 17.4479 54.728 17.5791C54.6476 17.7103 54.6074 17.8542 54.6074 18.0107C54.6074 18.125 54.6286 18.2287 54.6709 18.3218C54.7174 18.4106 54.7936 18.4932 54.8994 18.5693C55.0052 18.6413 55.1491 18.709 55.3311 18.7725C55.5173 18.8359 55.75 18.8973 56.0293 18.9565C56.554 19.0666 57.0047 19.2083 57.3813 19.3818C57.7622 19.5511 58.0542 19.7712 58.2573 20.042C58.4604 20.3086 58.562 20.6471 58.562 21.0576C58.562 21.3623 58.4964 21.6416 58.3652 21.8955C58.2383 22.1452 58.0521 22.3631 57.8066 22.5493C57.5612 22.7313 57.2671 22.873 56.9243 22.9746C56.5858 23.0762 56.2049 23.127 55.7817 23.127C55.1597 23.127 54.6328 23.0169 54.2012 22.7969C53.7695 22.5726 53.4416 22.2869 53.2173 21.9399C52.9972 21.5887 52.8872 21.2248 52.8872 20.8481H54.3662C54.3831 21.1317 54.4614 21.3581 54.6011 21.5273C54.745 21.6924 54.9227 21.813 55.1343 21.8892C55.3501 21.9611 55.5723 21.9971 55.8008 21.9971C56.0758 21.9971 56.3065 21.9611 56.4927 21.8892C56.6789 21.813 56.8206 21.7114 56.918 21.5845C57.0153 21.4533 57.064 21.3052 57.064 21.1401ZM64.0044 21.1401C64.0044 20.9878 63.9663 20.8503 63.8901 20.7275C63.814 20.6006 63.668 20.4863 63.4521 20.3848C63.2406 20.2832 62.9274 20.1901 62.5127 20.1055C62.1488 20.0251 61.8145 19.9299 61.5098 19.8198C61.2093 19.7056 60.9512 19.568 60.7354 19.4072C60.5195 19.2464 60.3524 19.056 60.2339 18.8359C60.1154 18.6159 60.0562 18.362 60.0562 18.0742C60.0562 17.7949 60.1175 17.5304 60.2402 17.2808C60.363 17.0311 60.5386 16.811 60.7671 16.6206C60.9956 16.4302 61.2728 16.2799 61.5986 16.1699C61.9287 16.0599 62.2969 16.0049 62.7031 16.0049C63.2786 16.0049 63.7716 16.1022 64.1821 16.2969C64.5968 16.4873 64.9142 16.7476 65.1343 17.0776C65.3543 17.4035 65.4644 17.7716 65.4644 18.1821H63.9346C63.9346 18.0002 63.888 17.8309 63.7949 17.6743C63.7061 17.5135 63.5706 17.3844 63.3887 17.2871C63.2067 17.1855 62.9782 17.1348 62.7031 17.1348C62.4408 17.1348 62.2228 17.1771 62.0493 17.2617C61.88 17.3421 61.7531 17.4479 61.6685 17.5791C61.5881 17.7103 61.5479 17.8542 61.5479 18.0107C61.5479 18.125 61.569 18.2287 61.6113 18.3218C61.6579 18.4106 61.734 18.4932 61.8398 18.5693C61.9456 18.6413 62.0895 18.709 62.2715 18.7725C62.4577 18.8359 62.6904 18.8973 62.9697 18.9565C63.4945 19.0666 63.9451 19.2083 64.3218 19.3818C64.7026 19.5511 64.9946 19.7712 65.1978 20.042C65.4009 20.3086 65.5024 20.6471 65.5024 21.0576C65.5024 21.3623 65.4368 21.6416 65.3057 21.8955C65.1787 22.1452 64.9925 22.3631 64.7471 22.5493C64.5016 22.7313 64.2075 22.873 63.8647 22.9746C63.5262 23.0762 63.1453 23.127 62.7222 23.127C62.1001 23.127 61.5732 23.0169 61.1416 22.7969C60.71 22.5726 60.382 22.2869 60.1577 21.9399C59.9377 21.5887 59.8276 21.2248 59.8276 20.8481H61.3066C61.3236 21.1317 61.4019 21.3581 61.5415 21.5273C61.6854 21.6924 61.8631 21.813 62.0747 21.8892C62.2905 21.9611 62.5127 21.9971 62.7412 21.9971C63.0163 21.9971 63.2469 21.9611 63.4331 21.8892C63.6193 21.813 63.7611 21.7114 63.8584 21.5845C63.9557 21.4533 64.0044 21.3052 64.0044 21.1401ZM70.5854 13.25H72.1152V21.5337L71.9692 23H70.5854V13.25ZM76.5967 19.5024V19.6357C76.5967 20.1436 76.5396 20.6112 76.4253 21.0386C76.3153 21.4618 76.146 21.8299 75.9175 22.1431C75.6932 22.4562 75.4139 22.6995 75.0796 22.873C74.7495 23.0423 74.3665 23.127 73.9307 23.127C73.5033 23.127 73.1309 23.0465 72.8135 22.8857C72.4961 22.7249 72.2295 22.4964 72.0137 22.2002C71.8021 21.904 71.6307 21.5506 71.4995 21.1401C71.3683 20.7297 71.2752 20.2769 71.2202 19.7817V19.3564C71.2752 18.8571 71.3683 18.4043 71.4995 17.998C71.6307 17.5876 71.8021 17.2342 72.0137 16.938C72.2295 16.6375 72.494 16.4069 72.8071 16.2461C73.1245 16.0853 73.4948 16.0049 73.918 16.0049C74.3581 16.0049 74.7453 16.0895 75.0796 16.2588C75.4181 16.4281 75.6995 16.6693 75.9238 16.9824C76.1481 17.2913 76.3153 17.6595 76.4253 18.0869C76.5396 18.5143 76.5967 18.9862 76.5967 19.5024ZM75.0669 19.6357V19.5024C75.0669 19.1935 75.0415 18.9036 74.9907 18.6328C74.9399 18.3577 74.8553 18.1165 74.7368 17.9092C74.6226 17.7018 74.466 17.5389 74.2671 17.4204C74.0724 17.2977 73.8291 17.2363 73.5371 17.2363C73.2663 17.2363 73.0335 17.2829 72.8389 17.376C72.6442 17.4691 72.4813 17.596 72.3501 17.7568C72.2189 17.9176 72.1152 18.1038 72.0391 18.3154C71.9671 18.527 71.9185 18.7555 71.8931 19.001V20.1499C71.9312 20.4673 72.0116 20.7593 72.1343 21.0259C72.2612 21.2882 72.439 21.4998 72.6675 21.6606C72.896 21.8172 73.1901 21.8955 73.5498 21.8955C73.8333 21.8955 74.0724 21.8384 74.2671 21.7241C74.4618 21.6099 74.6162 21.4512 74.7305 21.248C74.849 21.0407 74.9336 20.7995 74.9844 20.5244C75.0394 20.2493 75.0669 19.9531 75.0669 19.6357ZM82.0137 21.6226V18.3472C82.0137 18.1017 81.9692 17.8901 81.8804 17.7124C81.7915 17.5347 81.6561 17.3971 81.4741 17.2998C81.2964 17.2025 81.0721 17.1538 80.8013 17.1538C80.5516 17.1538 80.3358 17.1961 80.1538 17.2808C79.9718 17.3654 79.8301 17.4797 79.7285 17.6235C79.627 17.7674 79.5762 17.9303 79.5762 18.1123H78.0527C78.0527 17.8415 78.1183 17.5791 78.2495 17.3252C78.3807 17.0713 78.5711 16.8449 78.8208 16.646C79.0705 16.4471 79.3688 16.2905 79.7158 16.1763C80.0628 16.062 80.4521 16.0049 80.8838 16.0049C81.4001 16.0049 81.8571 16.0916 82.2549 16.2651C82.6569 16.4386 82.9722 16.701 83.2007 17.0522C83.4334 17.3993 83.5498 17.8351 83.5498 18.3599V21.4131C83.5498 21.7262 83.571 22.0076 83.6133 22.2573C83.6598 22.5028 83.7254 22.7165 83.8101 22.8984V23H82.2422C82.1702 22.835 82.1131 22.6255 82.0708 22.3716C82.0327 22.1134 82.0137 21.8638 82.0137 21.6226ZM82.2358 18.8232L82.2485 19.769H81.1504C80.8669 19.769 80.6172 19.7965 80.4014 19.8516C80.1855 19.9023 80.0057 19.9785 79.8618 20.0801C79.7179 20.1816 79.61 20.3044 79.5381 20.4482C79.4661 20.5921 79.4302 20.755 79.4302 20.937C79.4302 21.119 79.4725 21.2861 79.5571 21.4385C79.6418 21.5866 79.7645 21.703 79.9253 21.7876C80.0903 21.8722 80.2892 21.9146 80.522 21.9146C80.8351 21.9146 81.1081 21.8511 81.3408 21.7241C81.5778 21.5929 81.764 21.4342 81.8994 21.248C82.0348 21.0576 82.1068 20.8778 82.1152 20.7085L82.6104 21.3877C82.5596 21.5612 82.4728 21.7474 82.3501 21.9463C82.2274 22.1452 82.0666 22.3356 81.8677 22.5176C81.673 22.6953 81.4382 22.8413 81.1631 22.9556C80.8923 23.0698 80.5791 23.127 80.2236 23.127C79.7751 23.127 79.3752 23.0381 79.0239 22.8604C78.6727 22.6784 78.3976 22.4351 78.1987 22.1304C77.9998 21.8215 77.9004 21.4723 77.9004 21.083C77.9004 20.7191 77.9681 20.3975 78.1035 20.1182C78.2432 19.8346 78.4463 19.5977 78.7129 19.4072C78.9837 19.2168 79.3138 19.0729 79.7031 18.9756C80.0924 18.874 80.5368 18.8232 81.0361 18.8232H82.2358ZM86.9355 17.4395V23H85.4058V16.1318H86.8657L86.9355 17.4395ZM89.0366 16.0874L89.0239 17.5093C88.9308 17.4924 88.8293 17.4797 88.7192 17.4712C88.6134 17.4627 88.5076 17.4585 88.4019 17.4585C88.1395 17.4585 87.9089 17.4966 87.71 17.5728C87.5111 17.6447 87.3439 17.7505 87.2085 17.8901C87.0773 18.0256 86.9757 18.1906 86.9038 18.3853C86.8319 18.5799 86.7896 18.7979 86.7769 19.0391L86.4277 19.0645C86.4277 18.6328 86.4701 18.2329 86.5547 17.8647C86.6393 17.4966 86.7663 17.1729 86.9355 16.8936C87.109 16.6143 87.3249 16.3963 87.583 16.2397C87.8454 16.0832 88.1479 16.0049 88.4907 16.0049C88.5838 16.0049 88.6833 16.0133 88.7891 16.0303C88.8991 16.0472 88.9816 16.0662 89.0366 16.0874Z" fill="black" fill-opacity="0.87"/>
<path d="M16.6055 97.1914H18.293C18.9492 97.1914 19.4922 97.0781 19.9219 96.8516C20.3594 96.625 20.6836 96.3125 20.8945 95.9141C21.1055 95.5156 21.2109 95.0586 21.2109 94.543C21.2109 94.0039 21.1133 93.543 20.918 93.1602C20.7305 92.7695 20.4414 92.4688 20.0508 92.2578C19.668 92.0469 19.1797 91.9414 18.5859 91.9414C18.0859 91.9414 17.6328 92.043 17.2266 92.2461C16.8281 92.4414 16.5117 92.7227 16.2773 93.0898C16.043 93.4492 15.9258 93.8789 15.9258 94.3789H13.0898C13.0898 93.4727 13.3281 92.668 13.8047 91.9648C14.2812 91.2617 14.9297 90.7109 15.75 90.3125C16.5781 89.9062 17.5078 89.7031 18.5391 89.7031C19.6406 89.7031 20.6016 89.8867 21.4219 90.2539C22.25 90.6133 22.8945 91.1523 23.3555 91.8711C23.8164 92.5898 24.0469 93.4805 24.0469 94.543C24.0469 95.0273 23.9336 95.5195 23.707 96.0195C23.4805 96.5195 23.1445 96.9766 22.6992 97.3906C22.2539 97.7969 21.6992 98.1289 21.0352 98.3867C20.3711 98.6367 19.6016 98.7617 18.7266 98.7617H16.6055V97.1914ZM16.6055 99.3945V97.8477H18.7266C19.7266 97.8477 20.5781 97.9648 21.2812 98.1992C21.9922 98.4336 22.5703 98.7578 23.0156 99.1719C23.4609 99.5781 23.7852 100.043 23.9883 100.566C24.1992 101.09 24.3047 101.645 24.3047 102.23C24.3047 103.027 24.1602 103.738 23.8711 104.363C23.5898 104.98 23.1875 105.504 22.6641 105.934C22.1406 106.363 21.5273 106.688 20.8242 106.906C20.1289 107.125 19.3711 107.234 18.5508 107.234C17.8164 107.234 17.1133 107.133 16.4414 106.93C15.7695 106.727 15.168 106.426 14.6367 106.027C14.1055 105.621 13.6836 105.117 13.3711 104.516C13.0664 103.906 12.9141 103.203 12.9141 102.406H15.7383C15.7383 102.914 15.8555 103.363 16.0898 103.754C16.332 104.137 16.668 104.438 17.0977 104.656C17.5352 104.875 18.0352 104.984 18.5977 104.984C19.1914 104.984 19.7031 104.879 20.1328 104.668C20.5625 104.457 20.8906 104.145 21.1172 103.73C21.3516 103.316 21.4688 102.816 21.4688 102.23C21.4688 101.566 21.3398 101.027 21.082 100.613C20.8242 100.199 20.457 99.8945 19.9805 99.6992C19.5039 99.4961 18.9414 99.3945 18.293 99.3945H16.6055ZM35.4609 89.832H35.8125V92.1406H35.6133C34.6055 92.1406 33.7344 92.2969 33 92.6094C32.2734 92.9219 31.6758 93.3516 31.207 93.8984C30.7383 94.4453 30.3867 95.0859 30.1523 95.8203C29.9258 96.5469 29.8125 97.3203 29.8125 98.1406V100.824C29.8125 101.504 29.8867 102.105 30.0352 102.629C30.1836 103.145 30.3906 103.578 30.6562 103.93C30.9297 104.273 31.2422 104.535 31.5938 104.715C31.9453 104.895 32.3242 104.984 32.7305 104.984C33.1523 104.984 33.5352 104.898 33.8789 104.727C34.2227 104.547 34.5156 104.301 34.7578 103.988C35 103.676 35.1836 103.305 35.3086 102.875C35.4336 102.445 35.4961 101.977 35.4961 101.469C35.4961 100.984 35.4336 100.531 35.3086 100.109C35.1914 99.6797 35.0156 99.3047 34.7812 98.9844C34.5469 98.6562 34.2539 98.4023 33.9023 98.2227C33.5586 98.0352 33.1602 97.9414 32.707 97.9414C32.1445 97.9414 31.6328 98.0742 31.1719 98.3398C30.7188 98.6055 30.3516 98.9531 30.0703 99.3828C29.7969 99.8047 29.6484 100.254 29.625 100.73L28.5469 100.379C28.6094 99.6523 28.7695 99 29.0273 98.4219C29.293 97.8438 29.6406 97.3516 30.0703 96.9453C30.5 96.5391 30.9961 96.2305 31.5586 96.0195C32.1289 95.8008 32.7539 95.6914 33.4336 95.6914C34.2617 95.6914 34.9805 95.8477 35.5898 96.1602C36.1992 96.4727 36.7031 96.8984 37.1016 97.4375C37.5078 97.9688 37.8086 98.5781 38.0039 99.2656C38.207 99.9453 38.3086 100.656 38.3086 101.398C38.3086 102.219 38.1836 102.984 37.9336 103.695C37.6836 104.398 37.3164 105.016 36.832 105.547C36.3555 106.078 35.7734 106.492 35.0859 106.789C34.4062 107.086 33.6328 107.234 32.7656 107.234C31.8516 107.234 31.0352 107.059 30.3164 106.707C29.6055 106.355 29 105.871 28.5 105.254C28.0078 104.637 27.6328 103.926 27.375 103.121C27.1172 102.316 26.9883 101.465 26.9883 100.566V99.3945C26.9883 98.0977 27.1523 96.875 27.4805 95.7266C27.8086 94.5703 28.3125 93.5508 28.9922 92.668C29.6797 91.7852 30.5586 91.0938 31.6289 90.5938C32.6992 90.0859 33.9766 89.832 35.4609 89.832Z" fill="black" fill-opacity="0.87"/>
<path d="M42.7178 99.4873V98.9609C42.7178 98.5827 42.7998 98.2386 42.9639 97.9287C43.1279 97.6188 43.3626 97.3704 43.668 97.1836C43.9733 96.9967 44.3356 96.9033 44.7549 96.9033C45.1833 96.9033 45.5479 96.9967 45.8486 97.1836C46.154 97.3704 46.3887 97.6188 46.5527 97.9287C46.7168 98.2386 46.7988 98.5827 46.7988 98.9609V99.4873C46.7988 99.8564 46.7168 100.196 46.5527 100.506C46.3932 100.816 46.1608 101.064 45.8555 101.251C45.5547 101.438 45.1924 101.531 44.7686 101.531C44.3447 101.531 43.9779 101.438 43.668 101.251C43.3626 101.064 43.1279 100.816 42.9639 100.506C42.7998 100.196 42.7178 99.8564 42.7178 99.4873ZM43.668 98.9609V99.4873C43.668 99.6969 43.7067 99.8952 43.7842 100.082C43.8662 100.269 43.9893 100.422 44.1533 100.54C44.3174 100.654 44.5225 100.711 44.7686 100.711C45.0146 100.711 45.2174 100.654 45.377 100.54C45.5365 100.422 45.6549 100.269 45.7324 100.082C45.8099 99.8952 45.8486 99.6969 45.8486 99.4873V98.9609C45.8486 98.7467 45.8076 98.5462 45.7256 98.3594C45.6481 98.168 45.5273 98.0153 45.3633 97.9014C45.2038 97.7829 45.001 97.7236 44.7549 97.7236C44.5133 97.7236 44.3105 97.7829 44.1465 97.9014C43.987 98.0153 43.8662 98.168 43.7842 98.3594C43.7067 98.5462 43.668 98.7467 43.668 98.9609ZM47.5645 105.093V104.56C47.5645 104.186 47.6465 103.844 47.8105 103.534C47.9746 103.224 48.2093 102.976 48.5146 102.789C48.82 102.602 49.1823 102.509 49.6016 102.509C50.0299 102.509 50.3945 102.602 50.6953 102.789C51.0007 102.976 51.2354 103.224 51.3994 103.534C51.5635 103.844 51.6455 104.186 51.6455 104.56V105.093C51.6455 105.466 51.5635 105.808 51.3994 106.118C51.2399 106.428 51.0075 106.676 50.7021 106.863C50.4014 107.05 50.0391 107.144 49.6152 107.144C49.1914 107.144 48.8268 107.05 48.5215 106.863C48.2161 106.676 47.9792 106.428 47.8105 106.118C47.6465 105.808 47.5645 105.466 47.5645 105.093ZM48.5146 104.56V105.093C48.5146 105.302 48.5534 105.503 48.6309 105.694C48.7129 105.881 48.8359 106.034 49 106.152C49.1641 106.266 49.3691 106.323 49.6152 106.323C49.8613 106.323 50.0641 106.266 50.2236 106.152C50.3877 106.034 50.5085 105.881 50.5859 105.694C50.6634 105.507 50.7021 105.307 50.7021 105.093V104.56C50.7021 104.345 50.6611 104.145 50.5791 103.958C50.5016 103.771 50.3809 103.621 50.2168 103.507C50.0573 103.388 49.8522 103.329 49.6016 103.329C49.36 103.329 49.1572 103.388 48.9932 103.507C48.8337 103.621 48.7129 103.771 48.6309 103.958C48.5534 104.145 48.5146 104.345 48.5146 104.56ZM49.916 98.4619L45.0557 106.241L44.3447 105.79L49.2051 98.0107L49.916 98.4619Z" fill="black" fill-opacity="0.87"/>
<rect x="12" y="123" width="176" height="5" rx="2.5" fill="black" fill-opacity="0.04"/>
<rect width="51" height="5" rx="2.5" transform="matrix(-1 0 0 1 63 123)" fill="#3F52DD"/>
<path d="M17.5591 139.467V140.659C17.5591 141.3 17.5018 141.841 17.3872 142.281C17.2726 142.722 17.1079 143.076 16.8931 143.345C16.6782 143.613 16.4186 143.808 16.1143 143.93C15.8135 144.048 15.4733 144.107 15.0938 144.107C14.793 144.107 14.5155 144.07 14.2612 143.995C14.007 143.919 13.7778 143.799 13.5737 143.635C13.3732 143.466 13.2013 143.248 13.0581 142.979C12.9149 142.711 12.8057 142.385 12.7305 142.002C12.6553 141.619 12.6177 141.171 12.6177 140.659V139.467C12.6177 138.826 12.675 138.289 12.7896 137.855C12.9077 137.422 13.0742 137.075 13.2891 136.813C13.5039 136.549 13.7617 136.359 14.0625 136.244C14.3669 136.13 14.707 136.072 15.083 136.072C15.3874 136.072 15.6667 136.11 15.9209 136.185C16.1787 136.257 16.4079 136.373 16.6084 136.534C16.8089 136.692 16.979 136.903 17.1187 137.168C17.2619 137.429 17.3711 137.75 17.4463 138.129C17.5215 138.509 17.5591 138.955 17.5591 139.467ZM16.5601 140.82V139.3C16.5601 138.949 16.5386 138.641 16.4956 138.376C16.4562 138.108 16.3971 137.879 16.3184 137.689C16.2396 137.499 16.1393 137.345 16.0176 137.227C15.8994 137.109 15.7616 137.023 15.604 136.969C15.45 136.912 15.2764 136.883 15.083 136.883C14.8467 136.883 14.6372 136.928 14.4546 137.018C14.272 137.104 14.118 137.241 13.9927 137.431C13.8709 137.621 13.7778 137.87 13.7134 138.178C13.6489 138.486 13.6167 138.86 13.6167 139.3V140.82C13.6167 141.171 13.6364 141.481 13.6758 141.75C13.7188 142.018 13.7814 142.251 13.8638 142.448C13.9461 142.641 14.0464 142.8 14.1646 142.926C14.2827 143.051 14.4188 143.144 14.5728 143.205C14.7303 143.262 14.904 143.291 15.0938 143.291C15.3372 143.291 15.5503 143.244 15.7329 143.151C15.9155 143.058 16.0677 142.913 16.1895 142.716C16.3148 142.516 16.4079 142.26 16.4688 141.948C16.5296 141.633 16.5601 141.257 16.5601 140.82Z" fill="black" fill-opacity="0.54"/>
<path d="M171.916 136.137V144H170.922V137.377L168.918 138.108V137.211L171.76 136.137H171.916ZM179.997 139.467V140.659C179.997 141.3 179.939 141.841 179.825 142.281C179.71 142.722 179.545 143.076 179.331 143.345C179.116 143.613 178.856 143.808 178.552 143.93C178.251 144.048 177.911 144.107 177.531 144.107C177.23 144.107 176.953 144.07 176.699 143.995C176.444 143.919 176.215 143.799 176.011 143.635C175.811 143.466 175.639 143.248 175.496 142.979C175.352 142.711 175.243 142.385 175.168 142.002C175.093 141.619 175.055 141.171 175.055 140.659V139.467C175.055 138.826 175.112 138.289 175.227 137.855C175.345 137.422 175.512 137.075 175.727 136.813C175.941 136.549 176.199 136.359 176.5 136.244C176.804 136.13 177.145 136.072 177.521 136.072C177.825 136.072 178.104 136.11 178.358 136.185C178.616 136.257 178.845 136.373 179.046 136.534C179.246 136.692 179.417 136.903 179.556 137.168C179.699 137.429 179.809 137.75 179.884 138.129C179.959 138.509 179.997 138.955 179.997 139.467ZM178.998 140.82V139.3C178.998 138.949 178.976 138.641 178.933 138.376C178.894 138.108 178.835 137.879 178.756 137.689C178.677 137.499 178.577 137.345 178.455 137.227C178.337 137.109 178.199 137.023 178.042 136.969C177.888 136.912 177.714 136.883 177.521 136.883C177.284 136.883 177.075 136.928 176.892 137.018C176.709 137.104 176.556 137.241 176.43 137.431C176.308 137.621 176.215 137.87 176.151 138.178C176.086 138.486 176.054 138.86 176.054 139.3V140.82C176.054 141.171 176.074 141.481 176.113 141.75C176.156 142.018 176.219 142.251 176.301 142.448C176.384 142.641 176.484 142.8 176.602 142.926C176.72 143.051 176.856 143.144 177.01 143.205C177.168 143.262 177.341 143.291 177.531 143.291C177.775 143.291 177.988 143.244 178.17 143.151C178.353 143.058 178.505 142.913 178.627 142.716C178.752 142.516 178.845 142.26 178.906 141.948C178.967 141.633 178.998 141.257 178.998 140.82ZM186.434 139.467V140.659C186.434 141.3 186.377 141.841 186.262 142.281C186.148 142.722 185.983 143.076 185.768 143.345C185.553 143.613 185.294 143.808 184.989 143.93C184.688 144.048 184.348 144.107 183.969 144.107C183.668 144.107 183.39 144.07 183.136 143.995C182.882 143.919 182.653 143.799 182.449 143.635C182.248 143.466 182.076 143.248 181.933 142.979C181.79 142.711 181.681 142.385 181.605 142.002C181.53 141.619 181.493 141.171 181.493 140.659V139.467C181.493 138.826 181.55 138.289 181.665 137.855C181.783 137.422 181.949 137.075 182.164 136.813C182.379 136.549 182.637 136.359 182.938 136.244C183.242 136.13 183.582 136.072 183.958 136.072C184.262 136.072 184.542 136.11 184.796 136.185C185.054 136.257 185.283 136.373 185.483 136.534C185.684 136.692 185.854 136.903 185.994 137.168C186.137 137.429 186.246 137.75 186.321 138.129C186.396 138.509 186.434 138.955 186.434 139.467ZM185.435 140.82V139.3C185.435 138.949 185.414 138.641 185.371 138.376C185.331 138.108 185.272 137.879 185.193 137.689C185.115 137.499 185.014 137.345 184.893 137.227C184.774 137.109 184.637 137.023 184.479 136.969C184.325 136.912 184.151 136.883 183.958 136.883C183.722 136.883 183.512 136.928 183.33 137.018C183.147 137.104 182.993 137.241 182.868 137.431C182.746 137.621 182.653 137.87 182.588 138.178C182.524 138.486 182.492 138.86 182.492 139.3V140.82C182.492 141.171 182.511 141.481 182.551 141.75C182.594 142.018 182.656 142.251 182.739 142.448C182.821 142.641 182.921 142.8 183.04 142.926C183.158 143.051 183.294 143.144 183.448 143.205C183.605 143.262 183.779 143.291 183.969 143.291C184.212 143.291 184.425 143.244 184.608 143.151C184.791 143.058 184.943 142.913 185.064 142.716C185.19 142.516 185.283 142.26 185.344 141.948C185.405 141.633 185.435 141.257 185.435 140.82Z" fill="black" fill-opacity="0.54"/>
</g>
</g>
<rect x="0.5" y="0.5" width="199" height="159" rx="3.5" stroke="black" stroke-opacity="0.12"/>
<defs>
<filter id="filter0_d_4685_40989" x="-8" y="-4" width="216" height="176" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="4"/>
<feGaussianBlur stdDeviation="4"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.04 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4685_40989"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4685_40989" result="shape"/>
</filter>
<filter id="filter1_b_4685_40989" x="6" y="6" width="188" height="148" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feGaussianBlur in="BackgroundImageFix" stdDeviation="3"/>
<feComposite in2="SourceAlpha" operator="in" result="effect1_backgroundBlur_4685_40989"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_4685_40989" result="shape"/>
</filter>
<clipPath id="clip0_4685_40989">
<rect width="200" height="160" rx="4" fill="white"/>
</clipPath>
</defs>
</svg>
", "description": "Displays any value reading as a horizontal progress bar. Allows to configure value range, bar colors, and other settings.", "descriptor": { "type": "latest", @@ -19,7 +19,6 @@ "basicModeDirective": "tb-progress-bar-basic-config", "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"humidity\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"var value = prevValue + Math.random() * 7;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 0;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"alarmFilterConfig\":{\"statusList\":[\"ACTIVE\"]}}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"layout\":\"default\",\"autoScale\":true,\"showValue\":true,\"valueFont\":{\"family\":\"Roboto\",\"size\":24,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"32px\"},\"valueColor\":{\"type\":\"constant\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"colorFunction\":\"var temperature = value;\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120 * 100;\\n return tinycolor.mix('blue', 'red', percent).toHexString();\\n}\\nreturn 'blue';\"},\"tickMin\":0,\"tickMax\":100,\"showTicks\":true,\"ticksFont\":{\"family\":\"Roboto\",\"size\":11,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"400\",\"lineHeight\":\"16px\"},\"ticksColor\":\"rgba(0,0,0,0.54)\",\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}}},\"title\":\"Progress bar\",\"dropShadow\":true,\"enableFullscreen\":false,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":\"%\",\"decimals\":0,\"useDashboardTimewindow\":true,\"showLegend\":false,\"widgetStyle\":{},\"actions\":{},\"configMode\":\"basic\",\"displayTimewindow\":true,\"margin\":\"0px\",\"borderRadius\":\"0px\",\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"titleIcon\":\"mdi:water-percent\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"18px\",\"timewindowStyle\":{\"showIcon\":true,\"iconSize\":\"14px\",\"icon\":\"query_builder\",\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":null,\"weight\":null,\"style\":null,\"lineHeight\":\"1\"},\"color\":null},\"titleColor\":\"rgba(0, 0, 0, 0.87)\"}" }, - "externalId": null, "tags": [ "progress", "loading", diff --git a/application/src/main/data/json/system/widget_types/simple_value_and_chart_card.json b/application/src/main/data/json/system/widget_types/simple_value_and_chart_card.json index e19ff918be..a17d2ee031 100644 --- a/application/src/main/data/json/system/widget_types/simple_value_and_chart_card.json +++ b/application/src/main/data/json/system/widget_types/simple_value_and_chart_card.json @@ -2,7 +2,7 @@ "fqn": "simple_value_and_chart_card", "name": "Simple Value and chart card", "deprecated": false, - "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACgCAMAAAB+IdObAAAAflBMVEUAAADg4ODg4ODf39/////g4OAhISHj4+M/Ut09PT2srKx0dHSQkJDn6fvHx8fx8fEvLy9XaOHP1PdYWFi3vvKenp7z9P3V1dW6urqCgoKHk+pvfeVLXd/b3/lmZmaTnuyrs/DDyfWfqO5jc+Orq6tLS0ufqe5LXN97iOhKSkrA29V9AAAABHRSTlMA77cggcfpsAAABRRJREFUeNrsz0EBACEIADBBedu/7RlDua3BBgAAAAAAwO/MjHpdzvOIvZ63Y45s8DiTHLVaiC6RErmMyG0+9stdRXIYiKLJ5RZ6IBUIITlx1A7m/39wq3A3y/ZqN5jA0/M4ILnqWhYc5MD+EXk1vqZIlTv4fPwhUnin4B1IHLie9YnEGFVtEryDwozLWYs4IZxOPUcAJVoxIT0LIFGmpY5dzyB2oOQ8feY+MWIFZrQxRxZPu2DNJSKiVB5AYgjkzkAdiAyqbEA9LAjiAQOyr8nYlNqsKUAj4EsLEpWeLLhCxGdBZkeyIeSwZkPkXtFYsHmqzUWK1JBgaT1frd8i3KRGi0QDVlwiMthEBpOJyBmJNZERmGZ0qIgcegZAHaVRnkV8n51FxPdYcYVIIZ22EPGCJ3eRrhp0LdLofKDIYBJnIVK4QYM4jyAB6V8nMsTAkitEoCpArM8iGyyZNm5AGadIZAbaQ6RbVMNDJPsTMrHiGpEbQwuczyJsB70JXmynSLVGlQOVemDQu4dIfbOF+oYL+Eukdziy7VsBZq5nVPNEZN92DyB9Tzdg5OGNhV7htifL7M7Mj3086xX/5fqPRj+Al+VbipRU8LJ8zf+Rz8wv9ukYBWIYBqJoO40KCePCjhBJYe/9T7ikCCHJBTTg32m6B/aCZGtBsrUg2VqQbOWD+L5bpYdIbDjrhRsS2KK426HoQgxpiOtRlalCCwkc9yGqlRRip+POEaSQrs97QCghjvIc6vxRQtrnTwwYIUTQ3lOdnRDSIJ9twOggf3bNqElVEAzDNwx+CpggUimW5s457f//g0eWU5gszTi7hRc+F/lmTuMz34eQZgvil2T1IkJeeuZfovySrFuk02ComZv+bEH8kqxBhAnRBsZD0zPVnrnubx6afW8MIraIumgY4Z0KL0UYh7odNxd9M/LgTWQRxqHphJBX8BZ/0i1F1BkMT5a6EkRUEca5sElwzuYfTd/1l0vXojADVzFFrq7n2d/GmzAW0MIwNVFCyp69TUSA9K+hrrEWIV1zKtFoMAzyTSI1D11DGR/QQgSHq2wZ688a9LlnTHQD8At7tYg/TXfQuZbXbPnX/eFg0LW4y9VuFgqIHI6E5jbuMpcNFcmQJafkmCVPuqFFU5pbO6nGOi2m7aUU6sHOqIigSJJiQ7lzmZhsOOJPTExISvwFRQGGWfuoGngnTG/o7jfvuHCoAyK7FBc0I+YcjUda2WwdcYUo3lnBE6XjaxX+iTRDDjCiG4Z+FdkFRDL7d4sSF4/ZsMc5ys2u0S23z9CLXXBF7sGEbBV6Db7ICX+aTYWxyaXJdMyWNCVpOm4LTOxoskI+vEZvxm+tJLGjIb1nMmZLQlIy7soxPtiDKd3/YFXxShE34sk8OzJbiDCcowh4IrYIySx74yhMBxK9k7AItb3j8iIRAVcUASPie9CH7Ivsn9WDMxQBX+Rjcu6Vy47DvUh5Pi+NaKBRKAK+yB7j4+SUKfLY3Y7I522nzsB7FANfZF9gMsseJS7shXk2WKSGc5xy+CKJWXdkhvwrZ//zA0mB0yrPysd6tQ00LYqFv0S5QRCd5Ef2qd1/nN5qAN2hWPgiObnxgQ6TPCP5OJWn46RQPf95V63hqa6EQaCFrFKESRSdtdzE3kQ2kbWyiayNTWRtbCJrYxNZG//auQMaAEAYiIFZwvxbZjLgd+egBirkNUEhdSJ0znInZoI0W6r+Xc2WCgAAAAAAYJsLnGVmvd/WiIIAAAAASUVORK5CYII=", + "image": "tb-image:c2ltcGxlX3ZhbHVlX2FuZF9jaGFydF9jYXJkX3N5c3RlbV93aWRnZXRfaW1hZ2UucG5n:IlNpbXBsZSBWYWx1ZSBhbmQgY2hhcnQgY2FyZCIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect y="32" width="200" height="96" rx="4" fill="white"/>
<rect x="0.5" y="32.5" width="199" height="95" rx="3.5" stroke="black" stroke-opacity="0.12"/>
<path d="M16.7417 45.7578V55H15.1611V45.7578H16.7417ZM19.6426 45.7578V47.0273H12.2856V45.7578H19.6426ZM23.3774 55.127C22.8696 55.127 22.4105 55.0444 22 54.8794C21.5938 54.7101 21.2467 54.4753 20.959 54.1748C20.6755 53.8743 20.4575 53.521 20.3052 53.1147C20.1528 52.7085 20.0767 52.2705 20.0767 51.8008V51.5469C20.0767 51.0094 20.1549 50.5228 20.3115 50.0869C20.4681 49.651 20.686 49.2786 20.9653 48.9697C21.2446 48.6566 21.5747 48.4175 21.9556 48.2524C22.3364 48.0874 22.749 48.0049 23.1934 48.0049C23.6842 48.0049 24.1138 48.0874 24.4819 48.2524C24.8501 48.4175 25.1548 48.6502 25.396 48.9507C25.6414 49.2469 25.8234 49.6003 25.9419 50.0107C26.0646 50.4212 26.126 50.874 26.126 51.3691V52.0229H20.8193V50.9248H24.6152V50.8042C24.6068 50.5291 24.5518 50.271 24.4502 50.0298C24.3529 49.7886 24.2026 49.5939 23.9995 49.4458C23.7964 49.2977 23.5256 49.2236 23.187 49.2236C22.9331 49.2236 22.7067 49.2786 22.5078 49.3887C22.3132 49.4945 22.1502 49.6489 22.019 49.8521C21.8879 50.0552 21.7863 50.3006 21.7144 50.5884C21.6466 50.8719 21.6128 51.1914 21.6128 51.5469V51.8008C21.6128 52.1012 21.653 52.3805 21.7334 52.6387C21.818 52.8926 21.9408 53.1147 22.1016 53.3052C22.2624 53.4956 22.457 53.6458 22.6855 53.7559C22.9141 53.8617 23.1743 53.9146 23.4663 53.9146C23.8345 53.9146 24.1624 53.8405 24.4502 53.6924C24.738 53.5443 24.9876 53.3348 25.1992 53.064L26.0054 53.8447C25.8573 54.0605 25.6647 54.2679 25.4277 54.4668C25.1908 54.6615 24.9009 54.8201 24.5581 54.9429C24.2196 55.0656 23.826 55.127 23.3774 55.127ZM29.0991 49.5283V55H27.5693V48.1318H29.0103L29.0991 49.5283ZM28.8516 51.312L28.3311 51.3057C28.3311 50.8317 28.3903 50.3937 28.5088 49.9917C28.6273 49.5897 28.8008 49.2406 29.0293 48.9443C29.2578 48.6439 29.5413 48.4132 29.8799 48.2524C30.2227 48.0874 30.6183 48.0049 31.0669 48.0049C31.38 48.0049 31.6657 48.0514 31.9238 48.1445C32.1862 48.2334 32.4126 48.3752 32.603 48.5698C32.7977 48.7645 32.9458 49.0142 33.0474 49.3188C33.1532 49.6235 33.2061 49.9917 33.2061 50.4233V55H31.6763V50.5566C31.6763 50.2223 31.6255 49.96 31.5239 49.7695C31.4266 49.5791 31.2848 49.4437 31.0986 49.3633C30.9167 49.2786 30.6987 49.2363 30.4448 49.2363C30.1571 49.2363 29.9116 49.2913 29.7085 49.4014C29.5096 49.5114 29.3467 49.6616 29.2197 49.8521C29.0928 50.0425 28.9997 50.2625 28.9404 50.5122C28.8812 50.7619 28.8516 51.0285 28.8516 51.312ZM33.1108 50.9058L32.3936 51.0645C32.3936 50.6497 32.4507 50.2583 32.5649 49.8901C32.6834 49.5177 32.8548 49.1919 33.0791 48.9126C33.3076 48.6291 33.589 48.4069 33.9233 48.2461C34.2576 48.0853 34.6406 48.0049 35.0723 48.0049C35.4235 48.0049 35.7367 48.0535 36.0117 48.1509C36.291 48.244 36.528 48.3921 36.7227 48.5952C36.9173 48.7983 37.0654 49.0628 37.167 49.3887C37.2686 49.7103 37.3193 50.0996 37.3193 50.5566V55H35.7832V50.5503C35.7832 50.2033 35.7324 49.9346 35.6309 49.7441C35.5335 49.5537 35.3939 49.4225 35.2119 49.3506C35.0299 49.2744 34.812 49.2363 34.5581 49.2363C34.3211 49.2363 34.1117 49.2808 33.9297 49.3696C33.752 49.4543 33.6017 49.5749 33.479 49.7314C33.3563 49.8838 33.2632 50.0594 33.1997 50.2583C33.1405 50.4572 33.1108 50.673 33.1108 50.9058ZM40.6797 49.4521V57.6406H39.1499V48.1318H40.5591L40.6797 49.4521ZM45.1548 51.5024V51.6357C45.1548 52.1351 45.0955 52.5985 44.9771 53.0259C44.8628 53.4491 44.6914 53.8193 44.4629 54.1367C44.2386 54.4499 43.9614 54.6932 43.6313 54.8667C43.3013 55.0402 42.9204 55.127 42.4888 55.127C42.0614 55.127 41.6868 55.0487 41.3652 54.8921C41.0479 54.7313 40.7791 54.5049 40.5591 54.2129C40.339 53.9209 40.1613 53.5781 40.0259 53.1846C39.8947 52.7868 39.8016 52.3509 39.7466 51.877V51.3628C39.8016 50.8592 39.8947 50.4022 40.0259 49.9917C40.1613 49.5812 40.339 49.2279 40.5591 48.9316C40.7791 48.6354 41.0479 48.4069 41.3652 48.2461C41.6826 48.0853 42.0529 48.0049 42.4761 48.0049C42.9077 48.0049 43.2907 48.0895 43.625 48.2588C43.9593 48.4238 44.2407 48.6608 44.4692 48.9697C44.6978 49.2744 44.8691 49.6426 44.9834 50.0742C45.0977 50.5016 45.1548 50.9777 45.1548 51.5024ZM43.625 51.6357V51.5024C43.625 51.1851 43.5954 50.891 43.5361 50.6201C43.4769 50.3451 43.3838 50.1038 43.2568 49.8965C43.1299 49.6891 42.967 49.5283 42.7681 49.4141C42.5734 49.2956 42.3385 49.2363 42.0635 49.2363C41.7926 49.2363 41.5599 49.2829 41.3652 49.376C41.1706 49.4648 41.0076 49.5897 40.8765 49.7505C40.7453 49.9113 40.6437 50.0996 40.5718 50.3154C40.4998 50.527 40.4491 50.7576 40.4194 51.0073V52.2388C40.4702 52.5435 40.557 52.8228 40.6797 53.0767C40.8024 53.3306 40.9759 53.5337 41.2002 53.686C41.4287 53.8341 41.7207 53.9082 42.0762 53.9082C42.3512 53.9082 42.5861 53.849 42.7808 53.7305C42.9754 53.612 43.1341 53.4491 43.2568 53.2417C43.3838 53.0301 43.4769 52.7868 43.5361 52.5117C43.5954 52.2367 43.625 51.9447 43.625 51.6357ZM49.7339 55.127C49.2261 55.127 48.7669 55.0444 48.3564 54.8794C47.9502 54.7101 47.6032 54.4753 47.3154 54.1748C47.0319 53.8743 46.814 53.521 46.6616 53.1147C46.5093 52.7085 46.4331 52.2705 46.4331 51.8008V51.5469C46.4331 51.0094 46.5114 50.5228 46.668 50.0869C46.8245 49.651 47.0425 49.2786 47.3218 48.9697C47.6011 48.6566 47.9312 48.4175 48.312 48.2524C48.6929 48.0874 49.1055 48.0049 49.5498 48.0049C50.0407 48.0049 50.4702 48.0874 50.8384 48.2524C51.2065 48.4175 51.5112 48.6502 51.7524 48.9507C51.9979 49.2469 52.1799 49.6003 52.2983 50.0107C52.4211 50.4212 52.4824 50.874 52.4824 51.3691V52.0229H47.1758V50.9248H50.9717V50.8042C50.9632 50.5291 50.9082 50.271 50.8066 50.0298C50.7093 49.7886 50.5591 49.5939 50.356 49.4458C50.1528 49.2977 49.882 49.2236 49.5435 49.2236C49.2896 49.2236 49.0632 49.2786 48.8643 49.3887C48.6696 49.4945 48.5067 49.6489 48.3755 49.8521C48.2443 50.0552 48.1427 50.3006 48.0708 50.5884C48.0031 50.8719 47.9692 51.1914 47.9692 51.5469V51.8008C47.9692 52.1012 48.0094 52.3805 48.0898 52.6387C48.1745 52.8926 48.2972 53.1147 48.458 53.3052C48.6188 53.4956 48.8135 53.6458 49.042 53.7559C49.2705 53.8617 49.5308 53.9146 49.8228 53.9146C50.1909 53.9146 50.5189 53.8405 50.8066 53.6924C51.0944 53.5443 51.3441 53.3348 51.5557 53.064L52.3618 53.8447C52.2137 54.0605 52.0212 54.2679 51.7842 54.4668C51.5472 54.6615 51.2573 54.8201 50.9146 54.9429C50.576 55.0656 50.1825 55.127 49.7339 55.127ZM55.4619 49.4395V55H53.9321V48.1318H55.3921L55.4619 49.4395ZM57.563 48.0874L57.5503 49.5093C57.4572 49.4924 57.3556 49.4797 57.2456 49.4712C57.1398 49.4627 57.034 49.4585 56.9282 49.4585C56.6659 49.4585 56.4352 49.4966 56.2363 49.5728C56.0374 49.6447 55.8703 49.7505 55.7349 49.8901C55.6037 50.0256 55.5021 50.1906 55.4302 50.3853C55.3582 50.5799 55.3159 50.7979 55.3032 51.0391L54.9541 51.0645C54.9541 50.6328 54.9964 50.2329 55.0811 49.8647C55.1657 49.4966 55.2926 49.1729 55.4619 48.8936C55.6354 48.6143 55.8512 48.3963 56.1094 48.2397C56.3717 48.0832 56.6743 48.0049 57.0171 48.0049C57.1102 48.0049 57.2096 48.0133 57.3154 48.0303C57.4255 48.0472 57.508 48.0662 57.563 48.0874ZM62.415 53.6226V50.3472C62.415 50.1017 62.3706 49.8901 62.2817 49.7124C62.1929 49.5347 62.0575 49.3971 61.8755 49.2998C61.6978 49.2025 61.4735 49.1538 61.2026 49.1538C60.953 49.1538 60.7371 49.1961 60.5552 49.2808C60.3732 49.3654 60.2314 49.4797 60.1299 49.6235C60.0283 49.7674 59.9775 49.9303 59.9775 50.1123H58.4541C58.4541 49.8415 58.5197 49.5791 58.6509 49.3252C58.7821 49.0713 58.9725 48.8449 59.2222 48.646C59.4718 48.4471 59.7702 48.2905 60.1172 48.1763C60.4642 48.062 60.8535 48.0049 61.2852 48.0049C61.8014 48.0049 62.2585 48.0916 62.6562 48.2651C63.0583 48.4386 63.3735 48.701 63.6021 49.0522C63.8348 49.3993 63.9512 49.8351 63.9512 50.3599V53.4131C63.9512 53.7262 63.9723 54.0076 64.0146 54.2573C64.0612 54.5028 64.1268 54.7165 64.2114 54.8984V55H62.6436C62.5716 54.835 62.5145 54.6255 62.4722 54.3716C62.4341 54.1134 62.415 53.8638 62.415 53.6226ZM62.6372 50.8232L62.6499 51.769H61.5518C61.2682 51.769 61.0186 51.7965 60.8027 51.8516C60.5869 51.9023 60.4071 51.9785 60.2632 52.0801C60.1193 52.1816 60.0114 52.3044 59.9395 52.4482C59.8675 52.5921 59.8315 52.755 59.8315 52.937C59.8315 53.119 59.8739 53.2861 59.9585 53.4385C60.0431 53.5866 60.1659 53.703 60.3267 53.7876C60.4917 53.8722 60.6906 53.9146 60.9233 53.9146C61.2365 53.9146 61.5094 53.8511 61.7422 53.7241C61.9792 53.5929 62.1654 53.4342 62.3008 53.248C62.4362 53.0576 62.5081 52.8778 62.5166 52.7085L63.0117 53.3877C62.9609 53.5612 62.8742 53.7474 62.7515 53.9463C62.6287 54.1452 62.4679 54.3356 62.269 54.5176C62.0744 54.6953 61.8395 54.8413 61.5645 54.9556C61.2936 55.0698 60.9805 55.127 60.625 55.127C60.1764 55.127 59.7765 55.0381 59.4253 54.8604C59.0741 54.6784 58.799 54.4351 58.6001 54.1304C58.4012 53.8215 58.3018 53.4723 58.3018 53.083C58.3018 52.7191 58.3695 52.3975 58.5049 52.1182C58.6445 51.8346 58.8477 51.5977 59.1143 51.4072C59.3851 51.2168 59.7152 51.0729 60.1045 50.9756C60.4938 50.874 60.9382 50.8232 61.4375 50.8232H62.6372ZM68.9492 48.1318V49.249H65.0771V48.1318H68.9492ZM66.1943 46.4497H67.7241V53.1021C67.7241 53.3136 67.7537 53.4766 67.813 53.5908C67.8765 53.7008 67.9632 53.7749 68.0732 53.813C68.1833 53.8511 68.3123 53.8701 68.4604 53.8701C68.5662 53.8701 68.6678 53.8638 68.7651 53.8511C68.8625 53.8384 68.9408 53.8257 69 53.813L69.0063 54.981C68.8794 55.019 68.7313 55.0529 68.562 55.0825C68.397 55.1121 68.2065 55.127 67.9907 55.127C67.6395 55.127 67.3285 55.0656 67.0576 54.9429C66.7868 54.8159 66.5752 54.6107 66.4229 54.3271C66.2705 54.0436 66.1943 53.667 66.1943 53.1973V46.4497ZM74.5122 53.3813V48.1318H76.0483V55H74.6011L74.5122 53.3813ZM74.728 51.9531L75.2422 51.9404C75.2422 52.4017 75.1914 52.827 75.0898 53.2163C74.9883 53.6014 74.8317 53.9378 74.6201 54.2256C74.4085 54.5091 74.1377 54.7313 73.8076 54.8921C73.4775 55.0487 73.0819 55.127 72.6206 55.127C72.2863 55.127 71.9795 55.0783 71.7002 54.981C71.4209 54.8836 71.1797 54.7334 70.9766 54.5303C70.7777 54.3271 70.6232 54.0627 70.5132 53.7368C70.4032 53.411 70.3481 53.0216 70.3481 52.5688V48.1318H71.8779V52.5815C71.8779 52.8312 71.9076 53.0407 71.9668 53.21C72.026 53.375 72.1064 53.5083 72.208 53.6099C72.3096 53.7114 72.4281 53.7834 72.5635 53.8257C72.6989 53.868 72.8428 53.8892 72.9951 53.8892C73.431 53.8892 73.7738 53.8045 74.0234 53.6353C74.2773 53.4618 74.4572 53.229 74.563 52.937C74.673 52.645 74.728 52.3171 74.728 51.9531ZM79.4023 49.4395V55H77.8726V48.1318H79.3325L79.4023 49.4395ZM81.5034 48.0874L81.4907 49.5093C81.3976 49.4924 81.2961 49.4797 81.186 49.4712C81.0802 49.4627 80.9744 49.4585 80.8687 49.4585C80.6063 49.4585 80.3757 49.4966 80.1768 49.5728C79.9779 49.6447 79.8107 49.7505 79.6753 49.8901C79.5441 50.0256 79.4425 50.1906 79.3706 50.3853C79.2987 50.5799 79.2563 50.7979 79.2437 51.0391L78.8945 51.0645C78.8945 50.6328 78.9368 50.2329 79.0215 49.8647C79.1061 49.4966 79.2331 49.1729 79.4023 48.8936C79.5758 48.6143 79.7917 48.3963 80.0498 48.2397C80.3122 48.0832 80.6147 48.0049 80.9575 48.0049C81.0506 48.0049 81.1501 48.0133 81.2559 48.0303C81.3659 48.0472 81.4484 48.0662 81.5034 48.0874ZM85.6128 55.127C85.105 55.127 84.6458 55.0444 84.2354 54.8794C83.8291 54.7101 83.4821 54.4753 83.1943 54.1748C82.9108 53.8743 82.6929 53.521 82.5405 53.1147C82.3882 52.7085 82.312 52.2705 82.312 51.8008V51.5469C82.312 51.0094 82.3903 50.5228 82.5469 50.0869C82.7035 49.651 82.9214 49.2786 83.2007 48.9697C83.48 48.6566 83.8101 48.4175 84.1909 48.2524C84.5718 48.0874 84.9844 48.0049 85.4287 48.0049C85.9196 48.0049 86.3491 48.0874 86.7173 48.2524C87.0854 48.4175 87.3901 48.6502 87.6313 48.9507C87.8768 49.2469 88.0588 49.6003 88.1772 50.0107C88.3 50.4212 88.3613 50.874 88.3613 51.3691V52.0229H83.0547V50.9248H86.8506V50.8042C86.8421 50.5291 86.7871 50.271 86.6855 50.0298C86.5882 49.7886 86.438 49.5939 86.2349 49.4458C86.0317 49.2977 85.7609 49.2236 85.4224 49.2236C85.1685 49.2236 84.9421 49.2786 84.7432 49.3887C84.5485 49.4945 84.3856 49.6489 84.2544 49.8521C84.1232 50.0552 84.0216 50.3006 83.9497 50.5884C83.882 50.8719 83.8481 51.1914 83.8481 51.5469V51.8008C83.8481 52.1012 83.8883 52.3805 83.9688 52.6387C84.0534 52.8926 84.1761 53.1147 84.3369 53.3052C84.4977 53.4956 84.6924 53.6458 84.9209 53.7559C85.1494 53.8617 85.4097 53.9146 85.7017 53.9146C86.0698 53.9146 86.3978 53.8405 86.6855 53.6924C86.9733 53.5443 87.223 53.3348 87.4346 53.064L88.2407 53.8447C88.0926 54.0605 87.9001 54.2679 87.6631 54.4668C87.4261 54.6615 87.1362 54.8201 86.7935 54.9429C86.4549 55.0656 86.0614 55.127 85.6128 55.127Z" fill="black" fill-opacity="0.87"/>
<path d="M23.1636 108.026V110H13.1308V108.304L18.0033 102.989C18.5378 102.386 18.9593 101.865 19.2677 101.427C19.5761 100.988 19.7919 100.594 19.9153 100.245C20.0455 99.8883 20.1106 99.5422 20.1106 99.2064C20.1106 98.7336 20.0215 98.3189 19.8433 97.9626C19.672 97.5994 19.4184 97.315 19.0826 97.1094C18.7468 96.8969 18.3391 96.7907 17.8594 96.7907C17.3043 96.7907 16.8383 96.9106 16.4613 97.1505C16.0844 97.3904 15.8 97.7227 15.6081 98.1476C15.4163 98.5657 15.3203 99.0454 15.3203 99.5868H12.8429C12.8429 98.7164 13.0417 97.9215 13.4391 97.2019C13.8366 96.4755 14.4123 95.8998 15.1661 95.4749C15.92 95.0432 16.828 94.8273 17.8902 94.8273C18.8908 94.8273 19.7405 94.9952 20.4396 95.331C21.1386 95.6668 21.6697 96.1431 22.0329 96.7599C22.403 97.3767 22.588 98.1065 22.588 98.9494C22.588 99.4154 22.5126 99.878 22.3618 100.337C22.2111 100.796 21.9952 101.255 21.7142 101.715C21.4401 102.167 21.1146 102.623 20.7377 103.082C20.3607 103.534 19.9461 103.993 19.4938 104.459L16.2558 108.026H23.1636ZM35.1291 108.026V110H25.0962V108.304L29.9687 102.989C30.5033 102.386 30.9247 101.865 31.2331 101.427C31.5415 100.988 31.7574 100.594 31.8807 100.245C32.011 99.8883 32.0761 99.5422 32.0761 99.2064C32.0761 98.7336 31.987 98.3189 31.8088 97.9626C31.6375 97.5994 31.3839 97.315 31.0481 97.1094C30.7123 96.8969 30.3045 96.7907 29.8248 96.7907C29.2697 96.7907 28.8037 96.9106 28.4268 97.1505C28.0499 97.3904 27.7655 97.7227 27.5736 98.1476C27.3817 98.5657 27.2858 99.0454 27.2858 99.5868H24.8084C24.8084 98.7164 25.0071 97.9215 25.4046 97.2019C25.8021 96.4755 26.3777 95.8998 27.1316 95.4749C27.8854 95.0432 28.7934 94.8273 29.8557 94.8273C30.8562 94.8273 31.706 94.9952 32.405 95.331C33.104 95.6668 33.6351 96.1431 33.9983 96.7599C34.3684 97.3767 34.5534 98.1065 34.5534 98.9494C34.5534 99.4154 34.4781 99.878 34.3273 100.337C34.1765 100.796 33.9606 101.255 33.6797 101.715C33.4056 102.167 33.08 102.623 32.7031 103.082C32.3262 103.534 31.9116 103.993 31.4593 104.459L28.2212 108.026H35.1291Z" fill="black" fill-opacity="0.87"/>
<path d="M41.3261 97.572C41.3261 97.0717 41.4494 96.6125 41.6961 96.1945C41.9428 95.7765 42.2718 95.4441 42.683 95.1974C43.101 94.9438 43.5533 94.817 44.0399 94.817C44.5333 94.817 44.9822 94.9438 45.3865 95.1974C45.7908 95.4441 46.1129 95.7765 46.3528 96.1945C46.5995 96.6125 46.7229 97.0717 46.7229 97.572C46.7229 98.0722 46.5995 98.5314 46.3528 98.9494C46.1129 99.3606 45.7908 99.6861 45.3865 99.926C44.9822 100.166 44.5333 100.286 44.0399 100.286C43.5533 100.286 43.101 100.166 42.683 99.926C42.2718 99.6861 41.9428 99.3606 41.6961 98.9494C41.4494 98.5314 41.3261 98.0722 41.3261 97.572ZM42.7138 97.572C42.7138 97.942 42.844 98.2538 43.1044 98.5074C43.3649 98.7541 43.6767 98.8775 44.0399 98.8775C44.4031 98.8775 44.7081 98.7541 44.9548 98.5074C45.2015 98.2607 45.3248 97.9489 45.3248 97.572C45.3248 97.1882 45.2015 96.8695 44.9548 96.616C44.7081 96.3624 44.4031 96.2356 44.0399 96.2356C43.6767 96.2356 43.3649 96.3624 43.1044 96.616C42.844 96.8695 42.7138 97.1882 42.7138 97.572ZM58.421 105.127H60.9909C60.9087 106.107 60.6346 106.981 60.1686 107.749C59.7026 108.509 59.0481 109.109 58.2052 109.548C57.3622 109.986 56.3377 110.206 55.1316 110.206C54.2064 110.206 53.3738 110.041 52.6336 109.712C51.8935 109.376 51.2596 108.904 50.7319 108.294C50.2042 107.677 49.7999 106.933 49.5189 106.063C49.2448 105.193 49.1077 104.219 49.1077 103.144V101.9C49.1077 100.824 49.2482 99.8506 49.5292 98.9803C49.817 98.1099 50.2282 97.3664 50.7627 96.7496C51.2973 96.126 51.938 95.6497 52.685 95.3207C53.4389 94.9918 54.2852 94.8273 55.2241 94.8273C56.4165 94.8273 57.4239 95.0466 58.2463 95.4852C59.0687 95.9238 59.706 96.5303 60.1583 97.3047C60.6174 98.0791 60.8984 98.9666 61.0012 99.9671H58.4313C58.3628 99.3229 58.212 98.7713 57.979 98.3121C57.7529 97.8529 57.4171 97.5034 56.9716 97.2636C56.5262 97.0169 55.9437 96.8935 55.2241 96.8935C54.6347 96.8935 54.1207 97.0032 53.6821 97.2225C53.2435 97.4418 52.8769 97.7639 52.5822 98.1887C52.2875 98.6136 52.0648 99.1379 51.9141 99.7615C51.7701 100.378 51.6982 101.084 51.6982 101.879V103.144C51.6982 103.897 51.7633 104.583 51.8935 105.199C52.0306 105.809 52.2361 106.334 52.5103 106.772C52.7912 107.211 53.1476 107.55 53.5793 107.79C54.0111 108.03 54.5285 108.15 55.1316 108.15C55.8648 108.15 56.4576 108.033 56.9099 107.8C57.3691 107.567 57.7152 107.228 57.9482 106.782C58.188 106.33 58.3457 105.779 58.421 105.127Z" fill="black" fill-opacity="0.87"/>
<path d="M68.782 111.148L79.0732 104.876C80.7647 103.845 82.07 102.286 82.7875 100.44L85.8908 92.4545C88.2495 86.3849 96.8379 86.3849 99.1967 92.4545V92.4545C101.273 97.7979 108.483 98.6368 111.731 93.913L115.403 88.5725C117.667 85.2792 122.328 84.765 125.256 87.4856V87.4856C128.533 90.5304 133.83 89.4665 135.677 85.3927L138.501 79.1631C141.612 72.3021 151.264 72.0491 154.73 78.7379L160.17 89.237C162.261 93.2728 167.028 95.1229 171.294 93.5546L174.612 92.3348C176.838 91.5166 179.297 91.6075 181.456 92.5881L189.627 96.2988" stroke="#3F52DD" stroke-width="1.50376" stroke-linecap="round"/>
</svg>
", "description": "Displays a single entity historical telemetry values as a simplified chart. Optionally may display the corresponding latest telemetry value.", "descriptor": { "type": "timeseries", @@ -22,6 +22,5 @@ "basicModeDirective": "tb-value-chart-card-basic-config", "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature\",\"color\":\"rgb(63, 82, 221)\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}],\"latestDataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Latest\",\"color\":\"rgb(63, 82, 221)\",\"settings\":{},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\",\"aggregationType\":null,\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}]}],\"showTitle\":true,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":null,\"padding\":\"0\",\"settings\":{\"layout\":\"left\",\"autoScale\":true,\"showValue\":true,\"valueFont\":{\"family\":\"Roboto\",\"size\":28,\"sizeUnit\":\"px\",\"style\":\"normal\",\"weight\":\"500\",\"lineHeight\":\"32px\"},\"valueColor\":{\"type\":\"constant\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"colorFunction\":\"var temperature = value;\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120 * 100;\\n return tinycolor.mix('blue', 'red', percent).toHexString();\\n}\\nreturn 'blue';\"},\"background\":{\"type\":\"color\",\"color\":\"#fff\",\"overlay\":{\"enabled\":false,\"color\":\"rgba(255,255,255,0.72)\",\"blur\":3}}},\"title\":\"Simple Value and chart card\",\"dropShadow\":true,\"enableFullscreen\":false,\"titleStyle\":null,\"mobileHeight\":null,\"configMode\":\"basic\",\"actions\":{},\"showTitleIcon\":false,\"titleIcon\":\"thermostat\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":\"normal\",\"lineHeight\":\"24px\"},\"iconSize\":\"18px\",\"titleTooltip\":\"\",\"widgetStyle\":{},\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"useDashboardTimewindow\":true,\"decimals\":0,\"titleColor\":\"rgba(0, 0, 0, 0.87)\",\"borderRadius\":null,\"units\":\"°C\",\"displayTimewindow\":true,\"timewindow\":{\"hideInterval\":false,\"hideLastInterval\":false,\"hideQuickInterval\":false,\"hideAggregation\":false,\"hideAggInterval\":false,\"hideTimezone\":false,\"selectedTab\":1,\"history\":{\"historyType\":2,\"timewindowMs\":60000,\"interval\":43200000,\"fixedTimewindow\":{\"startTimeMs\":1697382151041,\"endTimeMs\":1697468551041},\"quickInterval\":\"CURRENT_MONTH_SO_FAR\"},\"aggregation\":{\"type\":\"AVG\",\"limit\":25000}},\"timewindowStyle\":{\"showIcon\":false,\"iconSize\":\"24px\",\"icon\":\"query_builder\",\"iconPosition\":\"left\",\"font\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"400\",\"style\":\"normal\",\"lineHeight\":\"16px\"},\"color\":\"rgba(0, 0, 0, 0.38)\",\"displayTypePrefix\":true}}" }, - "externalId": null, "tags": null } \ No newline at end of file diff --git a/application/src/main/data/json/system/widget_types/slider.json b/application/src/main/data/json/system/widget_types/slider.json new file mode 100644 index 0000000000..8cbf5326c3 --- /dev/null +++ b/application/src/main/data/json/system/widget_types/slider.json @@ -0,0 +1,39 @@ +{ + "fqn": "slider", + "name": "Slider", + "deprecated": false, + "image": "tb-image:SG9yaXpvbnRhbCBzbGlkZXIuc3Zn:IlNsaWRlciIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;data:image/svg+xml;base64,<svg width="200" height="160" viewBox="0 0 200 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M90.5064 60.918V63.168H78.2017L78.108 61.4688L85.4673 49.9375H87.7291L85.2798 54.1328L81.0494 60.918H90.5064ZM88.3736 49.9375V67H85.5494V49.9375H88.3736ZM103.609 62.3477C103.609 63.4102 103.363 64.3047 102.871 65.0312C102.379 65.7578 101.707 66.3086 100.855 66.6836C100.012 67.0508 99.0586 67.2344 97.9961 67.2344C96.9336 67.2344 95.9766 67.0508 95.125 66.6836C94.2734 66.3086 93.6016 65.7578 93.1094 65.0312C92.6172 64.3047 92.3711 63.4102 92.3711 62.3477C92.3711 61.6445 92.5078 61.0078 92.7813 60.4375C93.0547 59.8594 93.4414 59.3633 93.9414 58.9492C94.4492 58.5273 95.043 58.2031 95.7227 57.9766C96.4102 57.75 97.1602 57.6367 97.9727 57.6367C99.0508 57.6367 100.016 57.8359 100.867 58.2344C101.719 58.6328 102.387 59.1836 102.871 59.8867C103.363 60.5898 103.609 61.4102 103.609 62.3477ZM100.773 62.207C100.773 61.6367 100.656 61.1367 100.422 60.707C100.188 60.2773 99.8594 59.9453 99.4375 59.7109C99.0156 59.4766 98.5273 59.3594 97.9727 59.3594C97.4102 59.3594 96.9219 59.4766 96.5078 59.7109C96.0938 59.9453 95.7695 60.2773 95.5352 60.707C95.3086 61.1367 95.1953 61.6367 95.1953 62.207C95.1953 62.7852 95.3086 63.2852 95.5352 63.707C95.7617 64.1211 96.0859 64.4375 96.5078 64.6562C96.9297 64.875 97.4258 64.9844 97.9961 64.9844C98.5664 64.9844 99.0586 64.875 99.4727 64.6562C99.8867 64.4375 100.207 64.1211 100.434 63.707C100.66 63.2852 100.773 62.7852 100.773 62.207ZM103.223 54.4258C103.223 55.2773 102.996 56.0352 102.543 56.6992C102.098 57.3633 101.48 57.8867 100.691 58.2695C99.9023 58.6445 99.0039 58.832 97.9961 58.832C96.9805 58.832 96.0742 58.6445 95.2773 58.2695C94.4883 57.8867 93.8672 57.3633 93.4141 56.6992C92.9688 56.0352 92.7461 55.2773 92.7461 54.4258C92.7461 53.4102 92.9688 52.5547 93.4141 51.8594C93.8672 51.1562 94.4883 50.6211 95.2773 50.2539C96.0664 49.8867 96.9688 49.7031 97.9844 49.7031C99 49.7031 99.9023 49.8867 100.691 50.2539C101.48 50.6211 102.098 51.1562 102.543 51.8594C102.996 52.5547 103.223 53.4102 103.223 54.4258ZM100.398 54.5195C100.398 54.0117 100.297 53.5664 100.094 53.1836C99.8984 52.793 99.6211 52.4883 99.2617 52.2695C98.9023 52.0508 98.4766 51.9414 97.9844 51.9414C97.4922 51.9414 97.0664 52.0469 96.707 52.2578C96.3477 52.4688 96.0703 52.7656 95.875 53.1484C95.6797 53.5312 95.582 53.9883 95.582 54.5195C95.582 55.043 95.6797 55.5 95.875 55.8906C96.0703 56.2734 96.3477 56.5742 96.707 56.793C97.0742 57.0117 97.5039 57.1211 97.9961 57.1211C98.4883 57.1211 98.9141 57.0117 99.2734 56.793C99.6328 56.5742 99.9102 56.2734 100.105 55.8906C100.301 55.5 100.398 55.043 100.398 54.5195ZM106.037 54.1211V53.2188C106.037 52.5703 106.177 51.9805 106.458 51.4492C106.74 50.918 107.15 50.4922 107.689 50.1719C108.228 49.8516 108.876 49.6914 109.634 49.6914C110.415 49.6914 111.072 49.8516 111.603 50.1719C112.142 50.4922 112.552 50.918 112.833 51.4492C113.115 51.9805 113.255 52.5703 113.255 53.2188V54.1211C113.255 54.7539 113.115 55.3359 112.833 55.8672C112.56 56.3984 112.154 56.8242 111.615 57.1445C111.083 57.4648 110.431 57.625 109.658 57.625C108.892 57.625 108.236 57.4648 107.689 57.1445C107.15 56.8242 106.74 56.3984 106.458 55.8672C106.177 55.3359 106.037 54.7539 106.037 54.1211ZM107.994 53.2188V54.1211C107.994 54.4336 108.052 54.7305 108.169 55.0117C108.294 55.293 108.482 55.5195 108.732 55.6914C108.982 55.8633 109.29 55.9492 109.658 55.9492C110.033 55.9492 110.337 55.8633 110.572 55.6914C110.814 55.5195 110.994 55.293 111.111 55.0117C111.228 54.7305 111.287 54.4336 111.287 54.1211V53.2188C111.287 52.8984 111.224 52.5977 111.099 52.3164C110.982 52.0273 110.802 51.7969 110.56 51.625C110.318 51.4531 110.009 51.3672 109.634 51.3672C109.275 51.3672 108.97 51.4531 108.72 51.625C108.478 51.7969 108.294 52.0273 108.169 52.3164C108.052 52.5977 107.994 52.8984 107.994 53.2188ZM114.263 63.7305V62.8164C114.263 62.1758 114.404 61.5898 114.685 61.0586C114.974 60.5273 115.388 60.1016 115.927 59.7812C116.466 59.4609 117.115 59.3008 117.873 59.3008C118.654 59.3008 119.31 59.4609 119.841 59.7812C120.38 60.1016 120.787 60.5273 121.06 61.0586C121.341 61.5898 121.482 62.1758 121.482 62.8164V63.7305C121.482 64.3711 121.341 64.957 121.06 65.4883C120.787 66.0195 120.384 66.4453 119.853 66.7656C119.322 67.0859 118.673 67.2461 117.908 67.2461C117.134 67.2461 116.474 67.0859 115.927 66.7656C115.388 66.4453 114.974 66.0195 114.685 65.4883C114.404 64.957 114.263 64.3711 114.263 63.7305ZM116.232 62.8164V63.7305C116.232 64.043 116.294 64.3398 116.419 64.6211C116.552 64.9023 116.744 65.1328 116.994 65.3125C117.244 65.4844 117.544 65.5703 117.896 65.5703C118.294 65.5703 118.615 65.4844 118.857 65.3125C119.099 65.1328 119.271 64.9062 119.373 64.6328C119.482 64.3516 119.537 64.0508 119.537 63.7305V62.8164C119.537 62.4961 119.474 62.1953 119.349 61.9141C119.232 61.6328 119.048 61.4062 118.798 61.2344C118.556 61.0625 118.248 60.9766 117.873 60.9766C117.505 60.9766 117.201 61.0625 116.958 61.2344C116.716 61.4062 116.533 61.6328 116.408 61.9141C116.29 62.1953 116.232 62.4961 116.232 62.8164ZM118.576 52.375L110.244 65.7109L108.802 64.8789L117.134 51.543L118.576 52.375Z" fill="black" fill-opacity="0.87"/>
<rect y="79" width="200" height="8" rx="2.70174" fill="#5469FF" fill-opacity="0.3"/>
<circle cx="2.91946" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="18.2525" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="33.5845" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="48.9165" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="64.2486" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="79.5806" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="94.9136" cy="83" r="0.568878" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="110.677" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="126.871" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="143.065" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="159.26" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="175.455" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<circle cx="191.649" cy="83" r="1" fill="#5469FF" fill-opacity="0.82"/>
<rect y="79" width="101" height="8" rx="2.70174" fill="#5469FF"/>
<path d="M5.55908 95.4668V96.6592C5.55908 97.3001 5.50179 97.8408 5.38721 98.2812C5.27262 98.7217 5.10791 99.0762 4.89307 99.3447C4.67822 99.6133 4.41862 99.8084 4.11426 99.9302C3.81348 100.048 3.47331 100.107 3.09375 100.107C2.79297 100.107 2.51546 100.07 2.26123 99.9946C2.007 99.9194 1.77783 99.7995 1.57373 99.6348C1.37321 99.4665 1.20133 99.248 1.05811 98.9795C0.914876 98.7109 0.805664 98.3851 0.730469 98.002C0.655273 97.6188 0.617676 97.1712 0.617676 96.6592V95.4668C0.617676 94.8258 0.674967 94.2887 0.789551 93.8555C0.907715 93.4222 1.07422 93.0749 1.28906 92.8135C1.50391 92.5485 1.76172 92.3587 2.0625 92.2441C2.36686 92.1296 2.70703 92.0723 3.08301 92.0723C3.38737 92.0723 3.66667 92.1099 3.9209 92.1851C4.17871 92.2567 4.40788 92.373 4.6084 92.5342C4.80892 92.6917 4.979 92.903 5.11865 93.168C5.26188 93.4294 5.37109 93.7498 5.44629 94.1294C5.52148 94.509 5.55908 94.9548 5.55908 95.4668ZM4.56006 96.8203V95.3003C4.56006 94.9494 4.53857 94.6414 4.49561 94.3765C4.45622 94.1079 4.39714 93.8787 4.31836 93.689C4.23958 93.4992 4.13932 93.3452 4.01758 93.2271C3.89941 93.1089 3.76156 93.0229 3.604 92.9692C3.45003 92.9119 3.27637 92.8833 3.08301 92.8833C2.84668 92.8833 2.63721 92.9281 2.45459 93.0176C2.27197 93.1035 2.118 93.2414 1.99268 93.4312C1.87093 93.6209 1.77783 93.8698 1.71338 94.1777C1.64893 94.4857 1.6167 94.8599 1.6167 95.3003V96.8203C1.6167 97.1712 1.63639 97.481 1.67578 97.7495C1.71875 98.0181 1.78141 98.2508 1.86377 98.4478C1.94613 98.6411 2.04639 98.8005 2.16455 98.9258C2.28271 99.0511 2.41878 99.1442 2.57275 99.2051C2.73031 99.2624 2.90397 99.291 3.09375 99.291C3.33724 99.291 3.55029 99.2445 3.73291 99.1514C3.91553 99.0583 4.06771 98.9132 4.18945 98.7163C4.31478 98.5158 4.40788 98.2598 4.46875 97.9482C4.52962 97.6331 4.56006 97.2572 4.56006 96.8203Z" fill="black" fill-opacity="0.54"/>
<path d="M184.853 92.1367V100H183.859V93.3774L181.856 94.1079V93.2109L184.697 92.1367H184.853ZM192.934 95.4668V96.6592C192.934 97.3001 192.877 97.8408 192.762 98.2812C192.648 98.7217 192.483 99.0762 192.268 99.3447C192.053 99.6133 191.794 99.8084 191.489 99.9302C191.188 100.048 190.848 100.107 190.469 100.107C190.168 100.107 189.89 100.07 189.636 99.9946C189.382 99.9194 189.153 99.7995 188.949 99.6348C188.748 99.4665 188.576 99.248 188.433 98.9795C188.29 98.7109 188.181 98.3851 188.105 98.002C188.03 97.6188 187.993 97.1712 187.993 96.6592V95.4668C187.993 94.8258 188.05 94.2887 188.165 93.8555C188.283 93.4222 188.449 93.0749 188.664 92.8135C188.879 92.5485 189.137 92.3587 189.438 92.2441C189.742 92.1296 190.082 92.0723 190.458 92.0723C190.762 92.0723 191.042 92.1099 191.296 92.1851C191.554 92.2567 191.783 92.373 191.983 92.5342C192.184 92.6917 192.354 92.903 192.494 93.168C192.637 93.4294 192.746 93.7498 192.821 94.1294C192.896 94.509 192.934 94.9548 192.934 95.4668ZM191.935 96.8203V95.3003C191.935 94.9494 191.914 94.6414 191.871 94.3765C191.831 94.1079 191.772 93.8787 191.693 93.689C191.615 93.4992 191.514 93.3452 191.393 93.2271C191.274 93.1089 191.137 93.0229 190.979 92.9692C190.825 92.9119 190.651 92.8833 190.458 92.8833C190.222 92.8833 190.012 92.9281 189.83 93.0176C189.647 93.1035 189.493 93.2414 189.368 93.4312C189.246 93.6209 189.153 93.8698 189.088 94.1777C189.024 94.4857 188.992 94.8599 188.992 95.3003V96.8203C188.992 97.1712 189.011 97.481 189.051 97.7495C189.094 98.0181 189.156 98.2508 189.239 98.4478C189.321 98.6411 189.421 98.8005 189.54 98.9258C189.658 99.0511 189.794 99.1442 189.948 99.2051C190.105 99.2624 190.279 99.291 190.469 99.291C190.712 99.291 190.925 99.2445 191.108 99.1514C191.291 99.0583 191.443 98.9132 191.564 98.7163C191.69 98.5158 191.783 98.2598 191.844 97.9482C191.905 97.6331 191.935 97.2572 191.935 96.8203ZM199.372 95.4668V96.6592C199.372 97.3001 199.314 97.8408 199.2 98.2812C199.085 98.7217 198.92 99.0762 198.706 99.3447C198.491 99.6133 198.231 99.8084 197.927 99.9302C197.626 100.048 197.286 100.107 196.906 100.107C196.605 100.107 196.328 100.07 196.074 99.9946C195.819 99.9194 195.59 99.7995 195.386 99.6348C195.186 99.4665 195.014 99.248 194.871 98.9795C194.727 98.7109 194.618 98.3851 194.543 98.002C194.468 97.6188 194.43 97.1712 194.43 96.6592V95.4668C194.43 94.8258 194.487 94.2887 194.602 93.8555C194.72 93.4222 194.887 93.0749 195.102 92.8135C195.316 92.5485 195.574 92.3587 195.875 92.2441C196.179 92.1296 196.52 92.0723 196.896 92.0723C197.2 92.0723 197.479 92.1099 197.733 92.1851C197.991 92.2567 198.22 92.373 198.421 92.5342C198.621 92.6917 198.792 92.903 198.931 93.168C199.074 93.4294 199.184 93.7498 199.259 94.1294C199.334 94.509 199.372 94.9548 199.372 95.4668ZM198.373 96.8203V95.3003C198.373 94.9494 198.351 94.6414 198.308 94.3765C198.269 94.1079 198.21 93.8787 198.131 93.689C198.052 93.4992 197.952 93.3452 197.83 93.2271C197.712 93.1089 197.574 93.0229 197.417 92.9692C197.263 92.9119 197.089 92.8833 196.896 92.8833C196.659 92.8833 196.45 92.9281 196.267 93.0176C196.084 93.1035 195.931 93.2414 195.805 93.4312C195.683 93.6209 195.59 93.8698 195.526 94.1777C195.461 94.4857 195.429 94.8599 195.429 95.3003V96.8203C195.429 97.1712 195.449 97.481 195.488 97.7495C195.531 98.0181 195.594 98.2508 195.676 98.4478C195.759 98.6411 195.859 98.8005 195.977 98.9258C196.095 99.0511 196.231 99.1442 196.385 99.2051C196.543 99.2624 196.716 99.291 196.906 99.291C197.15 99.291 197.363 99.2445 197.545 99.1514C197.728 99.0583 197.88 98.9132 198.002 98.7163C198.127 98.5158 198.22 98.2598 198.281 97.9482C198.342 97.6331 198.373 97.2572 198.373 96.8203Z" fill="black" fill-opacity="0.54"/>
<circle cx="100" cy="83" r="8" fill="#5469FF"/>
</svg>
", + "description": "Allows users to move thumb of a slider to send commands to devices or update attributes/time-series data. Configurable settings let users define how to retrieve the initial state and specify actions for the value change.", + "descriptor": { + "type": "rpc", + "sizeX": 5, + "sizeY": 3, + "resources": [], + "templateHtml": "\n", + "templateCss": "", + "controllerScript": "self.onInit = function() {\n self.ctx.$scope.actionWidget.onInit();\n}\n\nself.typeParameters = function() {\n return {\n previewWidth: '360px',\n previewHeight: '220px',\n embedTitlePanel: true,\n displayRpcMessageToast: false\n };\n};\n\nself.onDestroy = function() {\n}\n", + "settingsSchema": "", + "dataKeySettingsSchema": "{}\n", + "settingsDirective": "tb-slider-widget-settings", + "hasBasicMode": true, + "basicModeDirective": "tb-slider-basic-config", + "defaultConfig": "{\"showTitle\":true,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{},\"title\":\"Slider\",\"dropShadow\":true,\"enableFullscreen\":false,\"widgetStyle\":{},\"actions\":{},\"widgetCss\":\"\",\"noDataDisplayMessage\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":null,\"weight\":\"500\",\"style\":null,\"lineHeight\":\"24px\"},\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"pageSize\":1024,\"titleIcon\":\"\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"14px\",\"configMode\":\"basic\",\"titleColor\":\"rgba(0, 0, 0, 0.87)\"}" + }, + "tags": [ + "command", + "downlink", + "device configuration", + "device control", + "invocation", + "remote method", + "remote function", + "interface", + "subroutine call", + "inter-process communication", + "server request", + "update attribute", + "set attribute", + "add time-series", + "slider" + ] +} \ No newline at end of file diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNode.java index abdcc5b299..0a9d0deb1d 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNode.java @@ -15,6 +15,8 @@ */ package org.thingsboard.rule.engine.geo; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -28,6 +30,7 @@ import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; import org.thingsboard.server.common.data.kv.StringDataEntry; import org.thingsboard.server.common.data.plugin.ComponentType; +import org.thingsboard.server.common.data.util.TbPair; import org.thingsboard.server.common.msg.TbMsg; import java.util.Collections; @@ -39,6 +42,11 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.ENTERED; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.INSIDE; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.LEFT; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.OUTSIDE; + /** * Created by ashvayka on 19.01.18. */ @@ -46,15 +54,24 @@ import java.util.concurrent.TimeoutException; @RuleNode( type = ComponentType.ACTION, name = "gps geofencing events", + version = 1, configClazz = TbGpsGeofencingActionNodeConfiguration.class, relationTypes = {"Success", "Entered", "Left", "Inside", "Outside"}, nodeDescription = "Produces incoming messages using GPS based geofencing", - nodeDetails = "Extracts latitude and longitude parameters from incoming message and returns different events based on configuration parameters", + nodeDetails = "Extracts latitude and longitude parameters from incoming message and returns different events based on configuration parameters. " + + "

" + + "If an object with coordinates extracted from incoming message enters the geofence, sends a message with the type Entered. " + + "If an object leaves the geofence, sends a message with the type Left. " + + "If the presence monitoring strategy \"On first message\" is selected, sends messages via rule node connection type Inside or Outside only the first time the geofencing and duration conditions are satisfied; otherwise sends messages via rule node connection type Success. " + + "If the presence monitoring strategy \"On each message\" is selected, sends messages via rule node connection type Inside or Outside every time the geofencing condition is satisfied. " + + "

" + + "Output connections: Entered, Left, Inside, Outside, Success", uiResources = {"static/rulenode/rulenode-core-config.js"}, configDirective = "tbActionNodeGpsGeofencingConfig" ) public class TbGpsGeofencingActionNode extends AbstractGeofencingNode { + private static final String REPORT_PRESENCE_STATUS_ON_EACH_MESSAGE = "reportPresenceStatusOnEachMessage"; private final Map entityStates = new HashMap<>(); private final Gson gson = new Gson(); private final JsonParser parser = new JsonParser(); @@ -80,25 +97,32 @@ public class TbGpsGeofencingActionNode extends AbstractGeofencingNode (entityState.isInside() ? - TimeUnit.valueOf(config.getMinInsideDurationTimeUnit()).toMillis(config.getMinInsideDuration()) : TimeUnit.valueOf(config.getMinOutsideDurationTimeUnit()).toMillis(config.getMinOutsideDuration()))) { - setStaid(ctx, msg.getOriginator(), entityState); - ctx.tellNext(msg, entityState.isInside() ? "Inside" : "Outside"); - told = true; - } - } + ctx.tellNext(msg, matches ? ENTERED : LEFT); + return; + } + + if (config.isReportPresenceStatusOnEachMessage()) { + ctx.tellNext(msg, entityState.isInside() ? INSIDE : OUTSIDE); + return; } - if (!told) { + + if (entityState.isStayed()) { ctx.tellSuccess(msg); + return; + } + + long stayTime = ts - entityState.getStateSwitchTime(); + if (stayTime > (entityState.isInside() ? + TimeUnit.valueOf(config.getMinInsideDurationTimeUnit()).toMillis(config.getMinInsideDuration()) : + TimeUnit.valueOf(config.getMinOutsideDurationTimeUnit()).toMillis(config.getMinOutsideDuration()))) { + setStaid(ctx, msg.getOriginator(), entityState); + ctx.tellNext(msg, entityState.isInside() ? INSIDE : OUTSIDE); + return; } + + ctx.tellSuccess(msg); } private void switchState(TbContext ctx, EntityId entityId, EntityGeofencingState entityState, boolean matches, long ts) { @@ -127,4 +151,17 @@ public class TbGpsGeofencingActionNode extends AbstractGeofencingNode getConfigClazz() { return TbGpsGeofencingActionNodeConfiguration.class; } + + @Override + public TbPair upgrade(int fromVersion, JsonNode oldConfiguration) throws TbNodeException { + boolean hasChanges = false; + if (fromVersion == 0) { + if (!oldConfiguration.has(REPORT_PRESENCE_STATUS_ON_EACH_MESSAGE)) { + hasChanges = true; + ((ObjectNode) oldConfiguration).put(REPORT_PRESENCE_STATUS_ON_EACH_MESSAGE, false); + } + } + return new TbPair<>(hasChanges, oldConfiguration); + } + } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java index d0adad8996..04bbab01b7 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java @@ -31,6 +31,8 @@ public class TbGpsGeofencingActionNodeConfiguration extends TbGpsGeofencingFilte private String minInsideDurationTimeUnit; private String minOutsideDurationTimeUnit; + private boolean reportPresenceStatusOnEachMessage; + @Override public TbGpsGeofencingActionNodeConfiguration defaultConfiguration() { TbGpsGeofencingActionNodeConfiguration configuration = new TbGpsGeofencingActionNodeConfiguration(); @@ -43,6 +45,7 @@ public class TbGpsGeofencingActionNodeConfiguration extends TbGpsGeofencingFilte configuration.setMinOutsideDurationTimeUnit(TimeUnit.MINUTES.name()); configuration.setMinInsideDuration(1); configuration.setMinOutsideDuration(1); + configuration.setReportPresenceStatusOnEachMessage(true); return configuration; } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/GpsGeofencingEvents.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/GpsGeofencingEvents.java new file mode 100644 index 0000000000..db5ddaf698 --- /dev/null +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/GpsGeofencingEvents.java @@ -0,0 +1,23 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.rule.engine.util; + +public class GpsGeofencingEvents { + public static final String ENTERED = "Entered"; + public static final String INSIDE = "Inside"; + public static final String LEFT = "Left"; + public static final String OUTSIDE = "Outside"; +} diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GpsGeofencingActionTestCase.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GpsGeofencingActionTestCase.java new file mode 100644 index 0000000000..804d30d28f --- /dev/null +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/GpsGeofencingActionTestCase.java @@ -0,0 +1,39 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.rule.engine.geo; + +import lombok.Data; +import org.thingsboard.server.common.data.id.EntityId; + +import java.util.HashMap; +import java.util.Map; + +@Data +public class GpsGeofencingActionTestCase { + + private EntityId entityId; + private Map entityStates; + private boolean msgInside; + private boolean reportPresenceStatusOnEachMessage; + + public GpsGeofencingActionTestCase(EntityId entityId, boolean msgInside, boolean reportPresenceStatusOnEachMessage, EntityGeofencingState entityGeofencingState) { + this.entityId = entityId; + this.msgInside = msgInside; + this.reportPresenceStatusOnEachMessage = reportPresenceStatusOnEachMessage; + this.entityStates = new HashMap<>(); + this.entityStates.put(entityId, entityGeofencingState); + } +} diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java new file mode 100644 index 0000000000..5cd7e02c59 --- /dev/null +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java @@ -0,0 +1,259 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.rule.engine.geo; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; +import org.thingsboard.common.util.JacksonUtil; +import org.thingsboard.rule.engine.AbstractRuleNodeUpgradeTest; +import org.thingsboard.rule.engine.api.TbContext; +import org.thingsboard.rule.engine.api.TbNode; +import org.thingsboard.rule.engine.api.TbNodeConfiguration; +import org.thingsboard.rule.engine.api.TbNodeException; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.msg.TbMsgType; +import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; +import org.thingsboard.server.dao.attributes.AttributesService; + +import java.time.Duration; +import java.util.UUID; +import java.util.stream.Stream; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.ENTERED; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.INSIDE; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.LEFT; +import static org.thingsboard.rule.engine.util.GpsGeofencingEvents.OUTSIDE; +import static org.thingsboard.server.common.data.msg.TbNodeConnectionType.SUCCESS; + +@ExtendWith(MockitoExtension.class) +class TbGpsGeofencingActionNodeTest extends AbstractRuleNodeUpgradeTest { + + @Mock + private TbContext ctx; + @Mock + private AttributesService attributesService; + private TbGpsGeofencingActionNode node; + + @BeforeEach + void setUp() { + node = spy(new TbGpsGeofencingActionNode()); + } + + @AfterEach + void tearDown() { + node.destroy(); + } + + private static Stream givenReportPresenceStatusOnEachMessage_whenOnMsg_thenVerifyOutputMsgType() { + DeviceId deviceId = new DeviceId(UUID.randomUUID()); + long tsNow = System.currentTimeMillis(); + long tsNowMinusMinuteAndMillis = tsNow - Duration.ofMinutes(1).plusMillis(1).toMillis(); + return Stream.of( + // default config with presenceMonitoringStrategyOnEachMessage false and msgInside true + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, false, + new EntityGeofencingState(false, 0, false)), ENTERED), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, false, + new EntityGeofencingState(true, tsNow, false)), SUCCESS), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, false, + new EntityGeofencingState(true, tsNowMinusMinuteAndMillis, false)), INSIDE), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, false, + new EntityGeofencingState(true, tsNow, true)), SUCCESS), + // default config with presenceMonitoringStrategyOnEachMessage false and msgInside false + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, false, + new EntityGeofencingState(false, 0, false)), LEFT), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, false, + new EntityGeofencingState(false, tsNow, false)), SUCCESS), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, false, + new EntityGeofencingState(false, tsNowMinusMinuteAndMillis, false)), OUTSIDE), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, false, + new EntityGeofencingState(false, tsNow, true)), SUCCESS), + // default config with presenceMonitoringStrategyOnEachMessage true and msgInside true + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, true, + new EntityGeofencingState(false, 0, false)), ENTERED), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, true, + new EntityGeofencingState(true, tsNow, false)), INSIDE), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, true, true, + new EntityGeofencingState(true, tsNowMinusMinuteAndMillis, false)), INSIDE), + // default config with presenceMonitoringStrategyOnEachMessage true and msgInside false + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, true, + new EntityGeofencingState(false, 0, false)), LEFT), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, true, + new EntityGeofencingState(false, tsNow, false)), OUTSIDE), + Arguments.of(new GpsGeofencingActionTestCase(deviceId, false, true, + new EntityGeofencingState(false, tsNowMinusMinuteAndMillis, false)), OUTSIDE) + ); + } + + @ParameterizedTest + @MethodSource + void givenReportPresenceStatusOnEachMessage_whenOnMsg_thenVerifyOutputMsgType( + GpsGeofencingActionTestCase gpsGeofencingActionTestCase, + String expectedOutput + ) throws TbNodeException { + // GIVEN + var config = new TbGpsGeofencingActionNodeConfiguration().defaultConfiguration(); + config.setReportPresenceStatusOnEachMessage(gpsGeofencingActionTestCase.isReportPresenceStatusOnEachMessage()); + + node.init(ctx, new TbNodeConfiguration(JacksonUtil.valueToTree(config))); + + TbMsg msg = gpsGeofencingActionTestCase.isMsgInside() ? + getInsideRectangleTbMsg(gpsGeofencingActionTestCase.getEntityId()) : + getOutsideRectangleTbMsg(gpsGeofencingActionTestCase.getEntityId()); + + when(ctx.getAttributesService()).thenReturn(attributesService); + + ReflectionTestUtils.setField(node, "entityStates", gpsGeofencingActionTestCase.getEntityStates()); + + // WHEN + node.onMsg(ctx, msg); + + // THEN + verify(ctx.getAttributesService(), never()).find(any(), any(), any(), anyString()); + verify(ctx, never()).tellFailure(any(), any(Throwable.class)); + verify(ctx, never()).enqueueForTellNext(any(), eq(expectedOutput), any(), any()); + verify(ctx, never()).ack(any()); + + if (SUCCESS.equals(expectedOutput)) { + verify(ctx).tellSuccess(eq(msg)); + } else { + verify(ctx).tellNext(eq(msg), eq(expectedOutput)); + } + } + + private TbMsg getOutsideRectangleTbMsg(EntityId entityId) { + return getTbMsg(entityId, getMetadataForNewVersionPolygonPerimeter(), + GeoUtilTest.POINT_OUTSIDE_SIMPLE_RECT.getLatitude(), + GeoUtilTest.POINT_OUTSIDE_SIMPLE_RECT.getLongitude()); + } + + private TbMsg getInsideRectangleTbMsg(EntityId entityId) { + return getTbMsg(entityId, getMetadataForNewVersionPolygonPerimeter(), + GeoUtilTest.POINT_INSIDE_SIMPLE_RECT_CENTER.getLatitude(), + GeoUtilTest.POINT_INSIDE_SIMPLE_RECT_CENTER.getLongitude()); + } + + private TbMsg getTbMsg(EntityId entityId, TbMsgMetaData metadata, double latitude, double longitude) { + String data = "{\"latitude\": " + latitude + ", \"longitude\": " + longitude + "}"; + return TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, entityId, metadata, data); + } + + private TbMsgMetaData getMetadataForNewVersionPolygonPerimeter() { + var metadata = new TbMsgMetaData(); + metadata.putValue("ss_perimeter", GeoUtilTest.SIMPLE_RECT); + return metadata; + } + + // Rule nodes upgrade + private static Stream givenFromVersionAndConfig_whenUpgrade_thenVerifyHasChangesAndConfig() { + return Stream.of( + // default config for version 0 + Arguments.of(0, + "{\n" + + " \"minInsideDuration\": 1,\n" + + " \"minOutsideDuration\": 1,\n" + + " \"minInsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"minOutsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"latitudeKeyName\": \"latitude\",\n" + + " \"longitudeKeyName\": \"longitude\",\n" + + " \"perimeterType\": \"POLYGON\",\n" + + " \"fetchPerimeterInfoFromMessageMetadata\": true,\n" + + " \"perimeterKeyName\": \"ss_perimeter\",\n" + + " \"polygonsDefinition\": null,\n" + + " \"centerLatitude\": null,\n" + + " \"centerLongitude\": null,\n" + + " \"range\": null,\n" + + " \"rangeUnit\": null\n" + + "}\n", + true, + "{\n" + + " \"minInsideDuration\": 1,\n" + + " \"minOutsideDuration\": 1,\n" + + " \"minInsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"minOutsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"reportPresenceStatusOnEachMessage\": false,\n" + + " \"latitudeKeyName\": \"latitude\",\n" + + " \"longitudeKeyName\": \"longitude\",\n" + + " \"perimeterType\": \"POLYGON\",\n" + + " \"fetchPerimeterInfoFromMessageMetadata\": true,\n" + + " \"perimeterKeyName\": \"ss_perimeter\",\n" + + " \"polygonsDefinition\": null,\n" + + " \"centerLatitude\": null,\n" + + " \"centerLongitude\": null,\n" + + " \"range\": null,\n" + + " \"rangeUnit\": null\n" + + "}\n"), + // default config for version 1 with upgrade from version 0 + Arguments.of(0, + "{\n" + + " \"minInsideDuration\": 1,\n" + + " \"minOutsideDuration\": 1,\n" + + " \"minInsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"minOutsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"reportPresenceStatusOnEachMessage\": false,\n" + + " \"latitudeKeyName\": \"latitude\",\n" + + " \"longitudeKeyName\": \"longitude\",\n" + + " \"perimeterType\": \"POLYGON\",\n" + + " \"fetchPerimeterInfoFromMessageMetadata\": true,\n" + + " \"perimeterKeyName\": \"ss_perimeter\",\n" + + " \"polygonsDefinition\": null,\n" + + " \"centerLatitude\": null,\n" + + " \"centerLongitude\": null,\n" + + " \"range\": null,\n" + + " \"rangeUnit\": null\n" + + "}\n", + false, + "{\n" + + " \"minInsideDuration\": 1,\n" + + " \"minOutsideDuration\": 1,\n" + + " \"minInsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"minOutsideDurationTimeUnit\": \"MINUTES\",\n" + + " \"reportPresenceStatusOnEachMessage\": false,\n" + + " \"latitudeKeyName\": \"latitude\",\n" + + " \"longitudeKeyName\": \"longitude\",\n" + + " \"perimeterType\": \"POLYGON\",\n" + + " \"fetchPerimeterInfoFromMessageMetadata\": true,\n" + + " \"perimeterKeyName\": \"ss_perimeter\",\n" + + " \"polygonsDefinition\": null,\n" + + " \"centerLatitude\": null,\n" + + " \"centerLongitude\": null,\n" + + " \"range\": null,\n" + + " \"rangeUnit\": null\n" + + "}\n") + ); + } + + @Override + protected TbNode getTestNode() { + return node; + } + +} diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts index c268be7bcd..32a6a755b4 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts @@ -103,6 +103,7 @@ import { import { PowerButtonBasicConfigComponent } from '@home/components/widget/config/basic/button/power-button-basic-config.component'; +import { SliderBasicConfigComponent } from '@home/components/widget/config/basic/rpc/slider-basic-config.component'; @NgModule({ declarations: [ @@ -135,7 +136,8 @@ import { SingleSwitchBasicConfigComponent, ActionButtonBasicConfigComponent, CommandButtonBasicConfigComponent, - PowerButtonBasicConfigComponent + PowerButtonBasicConfigComponent, + SliderBasicConfigComponent ], imports: [ CommonModule, @@ -172,7 +174,8 @@ import { SingleSwitchBasicConfigComponent, ActionButtonBasicConfigComponent, CommandButtonBasicConfigComponent, - PowerButtonBasicConfigComponent + PowerButtonBasicConfigComponent, + SliderBasicConfigComponent ] }) export class BasicWidgetConfigModule { @@ -203,5 +206,6 @@ export const basicWidgetConfigComponentsMap: {[key: string]: Type -
+
{{ 'widgets.power-button.power-on-colors' | translate }}
@@ -134,7 +134,7 @@
-
+
{{ 'widgets.power-button.power-off-colors' | translate }}
@@ -152,7 +152,7 @@
-
+
{{ 'widgets.power-button.disabled-colors' | translate }}
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html index 249acae52a..9f8d580bbc 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html @@ -86,7 +86,7 @@
-
+
{{ 'widgets.progress-bar.value' | translate }} @@ -104,7 +104,7 @@
-
+
{{ 'widgets.progress-bar.range' | translate }}
widgets.progress-bar.min
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/single-switch-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/single-switch-basic-config.component.html index 18fa3b5587..c6ac3abb45 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/single-switch-basic-config.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/single-switch-basic-config.component.html @@ -82,7 +82,7 @@ {{ 'widgets.single-switch.auto-scale' | translate }}
-
+
{{ 'widgets.single-switch.label' | translate }} @@ -99,7 +99,7 @@
-
+
{{ 'widgets.single-switch.icon' | translate }} diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.html new file mode 100644 index 0000000000..a8d84d4dc4 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.html @@ -0,0 +1,271 @@ + + + +
+
widgets.slider.behavior
+
+
widgets.slider.initial-value
+ +
+
+
widgets.slider.on-value-change
+ +
+
+
widgets.rpc-state.disabled-state
+ +
+
+
+
widget-config.appearance
+ + + {{ sliderLayoutTranslationMap.get(layout) | translate }} + + +
+ + {{ 'widgets.slider.auto-scale' | translate }} + +
+
+ + {{ 'widget-config.title' | translate }} + +
+ + + + + + + +
+
+
+ + {{ 'widgets.slider.icon' | translate }} + +
+ + + + + + + + +
+
+
+ + {{ 'widgets.slider.value' | translate }} + +
+ + + +
widget-config.decimals-suffix
+
+ + + + +
+
+
+
{{ 'widgets.slider.range' | translate }}
+
+
widgets.slider.min
+ + + +
widgets.slider.max
+ + + +
+
+
+ + {{ 'widgets.slider.range-ticks' | translate }} + +
+ + + + +
+
+
+ + {{ 'widgets.slider.tick-marks' | translate }} + +
+ + + + + +
+
+
+
{{ 'widgets.slider.colors' | translate }}
+
+
+
widgets.slider.main
+ + +
+ +
+
widgets.slider.background
+ + +
+
+
+
+
{{ 'widgets.rpc-state.disabled-state' | translate }}
+
+
+
widgets.slider.main
+ + +
+ +
+
widgets.slider.background
+ + +
+
+
+
+
+ {{ 'widgets.slider.left-icon' | translate }} +
+
+ + + + + + + + +
+
+
+
+ {{ 'widgets.slider.right-icon' | translate }} +
+
+ + + + + + + + +
+
+
+
+
widget-config.card-appearance
+
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+
widget-config.show-card-buttons
+ + {{ 'fullscreen.fullscreen' | translate }} + +
+
+
{{ 'widget-config.card-border-radius' | translate }}
+ + + +
+
+ + +
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.ts new file mode 100644 index 0000000000..b80c6acb08 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.ts @@ -0,0 +1,309 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { Component } from '@angular/core'; +import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { BasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models'; +import { WidgetConfigComponentData } from '@home/models/widget-component.models'; +import { TargetDevice, WidgetConfig, } from '@shared/models/widget.models'; +import { WidgetConfigComponent } from '@home/components/widget/widget-config.component'; +import { formatValue, isUndefined } from '@core/utils'; +import { ValueType } from '@shared/models/constants'; +import { + SliderLayout, + sliderLayoutImages, + sliderLayouts, + sliderLayoutTranslations, + sliderWidgetDefaultSettings, + SliderWidgetSettings +} from '@home/components/widget/lib/rpc/slider-widget.models'; +import { cssSizeToStrSize, resolveCssSize } from '@shared/models/widget-settings.models'; + +@Component({ + selector: 'tb-slider-basic-config', + templateUrl: './slider-basic-config.component.html', + styleUrls: ['../basic-config.scss'] +}) +export class SliderBasicConfigComponent extends BasicWidgetConfigComponent { + + get targetDevice(): TargetDevice { + return this.sliderWidgetConfigForm.get('targetDevice').value; + } + + sliderLayout = SliderLayout; + + sliderLayouts = sliderLayouts; + + sliderLayoutTranslationMap = sliderLayoutTranslations; + sliderLayoutImageMap = sliderLayoutImages; + + valueType = ValueType; + + sliderWidgetConfigForm: UntypedFormGroup; + + valuePreviewFn = this._valuePreviewFn.bind(this); + + constructor(protected store: Store, + protected widgetConfigComponent: WidgetConfigComponent, + private fb: UntypedFormBuilder) { + super(store, widgetConfigComponent); + } + + protected configForm(): UntypedFormGroup { + return this.sliderWidgetConfigForm; + } + + protected onConfigSet(configData: WidgetConfigComponentData) { + const settings: SliderWidgetSettings = {...sliderWidgetDefaultSettings, ...(configData.config.settings || {})}; + const iconSize = resolveCssSize(configData.config.iconSize); + this.sliderWidgetConfigForm = this.fb.group({ + targetDevice: [configData.config.targetDevice, []], + + initialState: [settings.initialState, []], + valueChange: [settings.valueChange, []], + disabledState: [settings.disabledState, []], + + layout: [settings.layout, []], + autoScale: [settings.autoScale, []], + + showTitle: [configData.config.showTitle, []], + title: [configData.config.title, []], + titleFont: [configData.config.titleFont, []], + titleColor: [configData.config.titleColor, []], + + showIcon: [configData.config.showTitleIcon, []], + iconSize: [iconSize[0], [Validators.min(0)]], + iconSizeUnit: [iconSize[1], []], + icon: [configData.config.titleIcon, []], + iconColor: [configData.config.iconColor, []], + + showValue: [settings.showValue, []], + valueUnits: [settings.valueUnits, []], + valueDecimals: [settings.valueDecimals, []], + valueFont: [settings.valueFont, []], + valueColor: [settings.valueColor, []], + + tickMin: [settings.tickMin, []], + tickMax: [settings.tickMax, []], + + showTicks: [settings.showTicks, []], + ticksFont: [settings.ticksFont, []], + ticksColor: [settings.ticksColor, []], + + showTickMarks: [settings.showTickMarks, []], + tickMarksCount: [settings.tickMarksCount, [Validators.min(2)]], + tickMarksColor: [settings.tickMarksColor, []], + + mainColor: [settings.mainColor, []], + backgroundColor: [settings.backgroundColor, []], + + mainColorDisabled: [settings.mainColorDisabled, []], + backgroundColorDisabled: [settings.backgroundColorDisabled, []], + + leftIconSize: [settings.leftIconSize, [Validators.min(0)]], + leftIconSizeUnit: [settings.leftIconSizeUnit, []], + leftIcon: [settings.leftIcon, []], + leftIconColor: [settings.leftIconColor, []], + + rightIconSize: [settings.rightIconSize, [Validators.min(0)]], + rightIconSizeUnit: [settings.rightIconSizeUnit, []], + rightIcon: [settings.rightIcon, []], + rightIconColor: [settings.rightIconColor, []], + + background: [settings.background, []], + + cardButtons: [this.getCardButtons(configData.config), []], + borderRadius: [configData.config.borderRadius, []], + + actions: [configData.config.actions || {}, []] + }); + } + + protected prepareOutputConfig(config: any): WidgetConfigComponentData { + this.widgetConfig.config.targetDevice = config.targetDevice; + + this.widgetConfig.config.showTitle = config.showTitle; + this.widgetConfig.config.title = config.title; + this.widgetConfig.config.titleFont = config.titleFont; + this.widgetConfig.config.titleColor = config.titleColor; + + this.widgetConfig.config.showTitleIcon = config.showIcon; + this.widgetConfig.config.iconSize = cssSizeToStrSize(config.iconSize, config.iconSizeUnit); + this.widgetConfig.config.titleIcon = config.icon; + this.widgetConfig.config.iconColor = config.iconColor; + + this.widgetConfig.config.settings = this.widgetConfig.config.settings || {}; + + this.widgetConfig.config.settings.initialState = config.initialState; + this.widgetConfig.config.settings.valueChange = config.valueChange; + this.widgetConfig.config.settings.disabledState = config.disabledState; + + this.widgetConfig.config.settings.layout = config.layout; + this.widgetConfig.config.settings.autoScale = config.autoScale; + + this.widgetConfig.config.settings.showValue = config.showValue; + this.widgetConfig.config.settings.valueUnits = config.valueUnits; + this.widgetConfig.config.settings.valueDecimals = config.valueDecimals; + this.widgetConfig.config.settings.valueFont = config.valueFont; + this.widgetConfig.config.settings.valueColor = config.valueColor; + + this.widgetConfig.config.settings.tickMin = config.tickMin; + this.widgetConfig.config.settings.tickMax = config.tickMax; + + this.widgetConfig.config.settings.showTicks = config.showTicks; + this.widgetConfig.config.settings.ticksFont = config.ticksFont; + this.widgetConfig.config.settings.ticksColor = config.ticksColor; + + this.widgetConfig.config.settings.showTickMarks = config.showTickMarks; + this.widgetConfig.config.settings.tickMarksCount = config.tickMarksCount; + this.widgetConfig.config.settings.tickMarksColor = config.tickMarksColor; + + this.widgetConfig.config.settings.mainColor = config.mainColor; + this.widgetConfig.config.settings.backgroundColor = config.backgroundColor; + + this.widgetConfig.config.settings.mainColorDisabled = config.mainColorDisabled; + this.widgetConfig.config.settings.backgroundColorDisabled = config.backgroundColorDisabled; + + this.widgetConfig.config.settings.leftIconSize = config.leftIconSize; + this.widgetConfig.config.settings.leftIconSizeUnit = config.leftIconSizeUnit; + this.widgetConfig.config.settings.leftIcon = config.leftIcon; + this.widgetConfig.config.settings.leftIconColor = config.leftIconColor; + + this.widgetConfig.config.settings.rightIconSize = config.rightIconSize; + this.widgetConfig.config.settings.rightIconSizeUnit = config.rightIconSizeUnit; + this.widgetConfig.config.settings.rightIcon = config.rightIcon; + this.widgetConfig.config.settings.rightIconColor = config.rightIconColor; + + this.widgetConfig.config.settings.background = config.background; + + this.setCardButtons(config.cardButtons, this.widgetConfig.config); + this.widgetConfig.config.borderRadius = config.borderRadius; + + this.widgetConfig.config.actions = config.actions; + return this.widgetConfig; + } + + protected validatorTriggers(): string[] { + return ['showTitle', 'showIcon', 'showValue', 'showTicks', 'showTickMarks', 'layout']; + } + + protected updateValidators(emitEvent: boolean, trigger?: string) { + const showTitle: boolean = this.sliderWidgetConfigForm.get('showTitle').value; + const showIcon: boolean = this.sliderWidgetConfigForm.get('showIcon').value; + const showValue: boolean = this.sliderWidgetConfigForm.get('showValue').value; + const showTicks: boolean = this.sliderWidgetConfigForm.get('showTicks').value; + const showTickMarks: boolean = this.sliderWidgetConfigForm.get('showTickMarks').value; + const layout: SliderLayout = this.sliderWidgetConfigForm.get('layout').value; + + const valueEnabled = layout !== SliderLayout.simplified; + const leftRightIconsEnabled = layout === SliderLayout.extended; + + if (showTitle) { + this.sliderWidgetConfigForm.get('title').enable(); + this.sliderWidgetConfigForm.get('titleFont').enable(); + this.sliderWidgetConfigForm.get('titleColor').enable(); + this.sliderWidgetConfigForm.get('showIcon').enable({emitEvent: false}); + if (showIcon) { + this.sliderWidgetConfigForm.get('iconSize').enable(); + this.sliderWidgetConfigForm.get('iconSizeUnit').enable(); + this.sliderWidgetConfigForm.get('icon').enable(); + this.sliderWidgetConfigForm.get('iconColor').enable(); + } else { + this.sliderWidgetConfigForm.get('iconSize').disable(); + this.sliderWidgetConfigForm.get('iconSizeUnit').disable(); + this.sliderWidgetConfigForm.get('icon').disable(); + this.sliderWidgetConfigForm.get('iconColor').disable(); + } + } else { + this.sliderWidgetConfigForm.get('title').disable(); + this.sliderWidgetConfigForm.get('titleFont').disable(); + this.sliderWidgetConfigForm.get('titleColor').disable(); + this.sliderWidgetConfigForm.get('showIcon').disable({emitEvent: false}); + this.sliderWidgetConfigForm.get('iconSize').disable(); + this.sliderWidgetConfigForm.get('iconSizeUnit').disable(); + this.sliderWidgetConfigForm.get('icon').disable(); + this.sliderWidgetConfigForm.get('iconColor').disable(); + } + + if (valueEnabled && showValue) { + this.sliderWidgetConfigForm.get('valueUnits').enable(); + this.sliderWidgetConfigForm.get('valueDecimals').enable(); + this.sliderWidgetConfigForm.get('valueFont').enable(); + this.sliderWidgetConfigForm.get('valueColor').enable(); + } else { + this.sliderWidgetConfigForm.get('valueUnits').disable(); + this.sliderWidgetConfigForm.get('valueDecimals').disable(); + this.sliderWidgetConfigForm.get('valueFont').disable(); + this.sliderWidgetConfigForm.get('valueColor').disable(); + } + + if (showTicks) { + this.sliderWidgetConfigForm.get('ticksFont').enable(); + this.sliderWidgetConfigForm.get('ticksColor').enable(); + } else { + this.sliderWidgetConfigForm.get('ticksFont').disable(); + this.sliderWidgetConfigForm.get('ticksColor').disable(); + } + + if (showTickMarks) { + this.sliderWidgetConfigForm.get('tickMarksCount').enable(); + this.sliderWidgetConfigForm.get('tickMarksColor').enable(); + } else { + this.sliderWidgetConfigForm.get('tickMarksCount').disable(); + this.sliderWidgetConfigForm.get('tickMarksColor').disable(); + } + + if (leftRightIconsEnabled) { + this.sliderWidgetConfigForm.get('leftIconSize').enable(); + this.sliderWidgetConfigForm.get('leftIconSizeUnit').enable(); + this.sliderWidgetConfigForm.get('leftIcon').enable(); + this.sliderWidgetConfigForm.get('leftIconColor').enable(); + this.sliderWidgetConfigForm.get('rightIconSize').enable(); + this.sliderWidgetConfigForm.get('rightIconSizeUnit').enable(); + this.sliderWidgetConfigForm.get('rightIcon').enable(); + this.sliderWidgetConfigForm.get('rightIconColor').enable(); + } else { + this.sliderWidgetConfigForm.get('leftIconSize').disable(); + this.sliderWidgetConfigForm.get('leftIconSizeUnit').disable(); + this.sliderWidgetConfigForm.get('leftIcon').disable(); + this.sliderWidgetConfigForm.get('leftIconColor').disable(); + this.sliderWidgetConfigForm.get('rightIconSize').disable(); + this.sliderWidgetConfigForm.get('rightIconSizeUnit').disable(); + this.sliderWidgetConfigForm.get('rightIcon').disable(); + this.sliderWidgetConfigForm.get('rightIconColor').disable(); + } + } + + private getCardButtons(config: WidgetConfig): string[] { + const buttons: string[] = []; + if (isUndefined(config.enableFullscreen) || config.enableFullscreen) { + buttons.push('fullscreen'); + } + return buttons; + } + + private setCardButtons(buttons: string[], config: WidgetConfig) { + config.enableFullscreen = buttons.includes('fullscreen'); + } + + private _valuePreviewFn(): string { + const units: string = this.sliderWidgetConfigForm.get('valueUnits').value; + const decimals: number = this.sliderWidgetConfigForm.get('valueDecimals').value; + return formatValue(48, decimals, units, false); + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts index dc56a1e992..cac6928bac 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.models.ts @@ -62,8 +62,6 @@ export abstract class BasicActionWidgetComponent implements OnInit, OnDestroy, A loading$ = this.loadingSubject.asObservable().pipe(share()); - error = ''; - protected constructor(protected cd: ChangeDetectorRef) { } @@ -99,8 +97,7 @@ export abstract class BasicActionWidgetComponent implements OnInit, OnDestroy, A } public clearError() { - this.error = ''; - this.cd.markForCheck(); + this.ctx.hideToast(this.ctx.toastTargetId); } protected createValueGetter(getValueSettings: GetValueSettings, @@ -113,7 +110,8 @@ export abstract class BasicActionWidgetComponent implements OnInit, OnDestroy, A } }, error: (err: any) => { - this.onError(err); + const message = parseError(this.ctx, err); + this.onError(message); if (valueObserver?.error) { valueObserver.error(err); } @@ -132,8 +130,7 @@ export abstract class BasicActionWidgetComponent implements OnInit, OnDestroy, A } private onError(error: string) { - this.error = error; - this.cd.markForCheck(); + this.ctx.showErrorToast(error, 'bottom', 'center', this.ctx.toastTargetId, true); } protected updateValue(valueSetter: ValueSetter, @@ -295,6 +292,8 @@ export class ValueToDataConverter { constructor(protected settings: ValueToDataSettings) { switch (settings.type) { + case ValueToDataType.VALUE: + break; case ValueToDataType.CONSTANT: this.constantValue = this.settings.constantValue; break; @@ -312,6 +311,8 @@ export class ValueToDataConverter { valueToData(value: V): any { switch (this.settings.type) { + case ValueToDataType.VALUE: + return value; case ValueToDataType.CONSTANT: return this.constantValue; case ValueToDataType.FUNCTION: diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.scss b/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.scss index 6641c2c32e..081cb00f0d 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/action/action-widget.scss @@ -19,34 +19,3 @@ left: 0; right: 0; } -.tb-action-widget-error-container { - position: absolute; - bottom: 0; - left: 0; - right: 0; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - z-index: 1; - .tb-action-widget-error-panel { - display: flex; - padding: 4px 4px 4px 12px; - justify-content: center; - align-items: center; - gap: 4px; - border-radius: 4px; - background-color: #fff2f3; - box-shadow: -2px 2px 4px 0px rgba(0,0,0,0.2); - .tb-action-widget-error-text { - font-size: 12px; - font-style: normal; - font-weight: 400; - line-height: 16px; - color: rgba(209, 39, 48, 1); - } - .tb-action-widget-error-clear { - color: rgba(209, 39, 48, 1); - } - } -} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/button/action-button-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/button/action-button-widget.component.html index 02e2406859..294ba855fe 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/button/action-button-widget.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/button/action-button-widget.component.html @@ -27,10 +27,4 @@ [ctx]="ctx" (clicked)="onClick($event)"> -
-
-
- -
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/button/command-button-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/button/command-button-widget.component.html index 26f910fdd7..d48ba2f5e4 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/button/command-button-widget.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/button/command-button-widget.component.html @@ -27,10 +27,4 @@ (clicked)="onClick($event)"> -
-
-
- -
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.html index 93e394ac5e..48e4106a97 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/power-button-widget.component.html @@ -23,10 +23,4 @@
-
-
-
- -
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/single-switch-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/single-switch-widget.component.html index c1c05cf880..fd9aaca4a6 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/single-switch-widget.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/single-switch-widget.component.html @@ -37,10 +37,4 @@
-
-
-
- -
-
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.html new file mode 100644 index 0000000000..f15892dd52 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.html @@ -0,0 +1,59 @@ + +
+
+
+ +
+
+
+
{{ valueText }}
+
+
+
+ {{ leftIcon }} +
+
+ + + +
+
+
{{ settings.tickMin }}
+
+
+
{{ settings.tickMax }}
+
+
+
+
+ {{ rightIcon }} +
+
+
+ +
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.scss new file mode 100644 index 0000000000..0d7115fccb --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.scss @@ -0,0 +1,135 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +$mainColor: var(--tb-slider-main-color, #5469FF); +$hoverRippleColor: var(--tb-slider-hover-ripple-color, rgba(84, 105, 255, 0.05)); +$focusRippleColor: var(--tb-slider-focus-ripple-color, rgba(84, 105, 255, 0.2)); +$backgroundColor: var(--tb-slider-background-color, #CCD2FF); +$tickMarksColor: var(--tb-slider-tick-marks-color, #5469FF); + +$mainColorDisabled: var(--tb-slider-main-color-disabled, #9BA2B0); +$backgroundColorDisabled: var(--tb-slider-background-color-disabled, #D5D7E5); + +.tb-slider-panel { + + .mat-mdc-slider.mat-primary.tb-slider { + --mdc-slider-active-track-color: #{$mainColor}; + --mdc-slider-handle-color: #{$mainColor}; + --mdc-slider-focus-handle-color: #{$mainColor}; + --mdc-slider-hover-handle-color: #{$mainColor}; + + --mdc-slider-with-tick-marks-inactive-container-color: #{$tickMarksColor}; + --mat-mdc-slider-ripple-color: #{$mainColor}; + + --mat-mdc-slider-hover-ripple-color: #{$hoverRippleColor}; + --mat-mdc-slider-focus-ripple-color: #{$focusRippleColor}; + + --mdc-slider-inactive-track-color: #{$backgroundColor}; + + --mdc-slider-disabled-active-track-color: #{$mainColorDisabled}; + --mdc-slider-disabled-handle-color: #{$mainColorDisabled}; + + --mdc-slider-disabled-inactive-track-color: #{$backgroundColorDisabled}; + --mdc-slider-with-tick-marks-disabled-container-color: #{$mainColorDisabled}; + + --mdc-slider-handle-width: 16px; + --mdc-slider-handle-height: 16px; + } + + width: 100%; + height: 100%; + position: relative; + display: flex; + flex-direction: column; + padding: 20px 24px 24px 24px; + gap: 8px; + > div:not(.tb-slider-overlay), > tb-icon { + z-index: 1; + } + .tb-slider-overlay { + position: absolute; + inset: 12px; + } + div.tb-slider-title-panel { + z-index: 2; + } + .tb-slider-content { + flex: 1; + min-height: 0; + display: flex; + position: relative; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 12px; + .tb-slider-value-container { + min-height: 0; + } + .tb-slider-value { + white-space: nowrap; + } + .tb-slider-container { + align-self: stretch; + display: flex; + flex-direction: row; + align-items: flex-start; + gap: 8px; + &.tb-min-height { + height: 6px; + } + .tb-slider-column { + flex: 1; + display: flex; + flex-direction: column; + gap: 4px; + .mat-mdc-slider.tb-slider { + margin: 0; + height: 6px; + min-height: 6px; + min-width: 0; + &.mdc-slider--disabled { + opacity: 1; + } + .mdc-slider__track--inactive { + opacity: 1; + } + .mdc-slider__tick-marks { + .mdc-slider__tick-mark--active { + display: none; + } + .mdc-slider__tick-mark--inactive { + opacity: 1; + } + } + .mdc-slider__thumb.mat-mdc-slider-visual-thumb { + top: -21px; + .mat-ripple { + overflow: visible; + } + } + .mdc-slider__value-indicator-text { + white-space: nowrap; + } + } + .tb-slider-ticks { + display: flex; + flex-direction: row; + align-items: flex-start; + justify-content: space-between; + } + } + } + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.ts new file mode 100644 index 0000000000..37b5319d44 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.component.ts @@ -0,0 +1,347 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { + AfterViewInit, + ChangeDetectorRef, + Component, + ElementRef, + OnDestroy, + OnInit, + Renderer2, + ViewChild, + ViewEncapsulation +} from '@angular/core'; +import { BasicActionWidgetComponent, ValueSetter } from '@home/components/widget/lib/action/action-widget.models'; +import { + backgroundStyle, + ComponentStyle, + iconStyle, + overlayStyle, + textStyle +} from '@shared/models/widget-settings.models'; +import { Observable } from 'rxjs'; +import { ResizeObserver } from '@juggle/resize-observer'; +import { ImagePipe } from '@shared/pipe/image.pipe'; +import { DomSanitizer } from '@angular/platform-browser'; +import { ValueType } from '@shared/models/constants'; +import { UtilsService } from '@core/services/utils.service'; +import { + SliderLayout, + sliderWidgetDefaultSettings, + SliderWidgetSettings +} from '@home/components/widget/lib/rpc/slider-widget.models'; +import { formatValue, isDefinedAndNotNull, isNumeric } from '@core/utils'; +import { WidgetComponent } from '@home/components/widget/widget.component'; +import tinycolor from 'tinycolor2'; + +@Component({ + selector: 'tb-slider-widget', + templateUrl: './slider-widget.component.html', + styleUrls: ['../action/action-widget.scss', './slider-widget.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class SliderWidgetComponent extends + BasicActionWidgetComponent implements OnInit, AfterViewInit, OnDestroy { + + @ViewChild('sliderContent', {static: false}) + sliderContent: ElementRef; + + @ViewChild('sliderValueContainer', {static: false}) + sliderValueContainer: ElementRef; + + @ViewChild('sliderValue', {static: false}) + sliderValue: ElementRef; + + @ViewChild('sliderTickMinContainer', {static: false}) + sliderTickMinContainer: ElementRef; + + @ViewChild('sliderTickMin', {static: false}) + sliderTickMin: ElementRef; + + @ViewChild('sliderTickMaxContainer', {static: false}) + sliderTickMaxContainer: ElementRef; + + @ViewChild('sliderTickMax', {static: false}) + sliderTickMax: ElementRef; + + @ViewChild('leftSliderIconContainer', {static: false, read: ElementRef}) + leftSliderIconContainer: ElementRef; + + @ViewChild('leftSliderIcon', {static: false, read: ElementRef}) + leftSliderIcon: ElementRef; + + @ViewChild('rightSliderIconContainer', {static: false, read: ElementRef}) + rightSliderIconContainer: ElementRef; + + @ViewChild('rightSliderIcon', {static: false, read: ElementRef}) + rightSliderIcon: ElementRef; + + settings: SliderWidgetSettings; + + backgroundStyle$: Observable; + overlayStyle: ComponentStyle = {}; + + value: number = null; + private prevValue: number = null; + + disabled = false; + + layout: SliderLayout; + + showValue = true; + valueText = 'N/A'; + valueStyle: ComponentStyle = {}; + + showLeftRightIcon = false; + leftIcon = ''; + leftIconStyle: ComponentStyle = {}; + rightIcon = ''; + rightIconStyle: ComponentStyle = {}; + + showTicks = true; + ticksStyle: ComponentStyle = {}; + + sliderStep: number = undefined; + + autoScale = false; + + showWidgetTitlePanel = this.widgetComponent.dashboardWidget.showWidgetTitlePanel; + + sliderValueText = this._sliderValueText.bind(this); + + private panelResize$: ResizeObserver; + + private valueSetter: ValueSetter; + + private sliderCssClass: string; + + constructor(protected imagePipe: ImagePipe, + protected sanitizer: DomSanitizer, + private renderer: Renderer2, + private utils: UtilsService, + private widgetComponent: WidgetComponent, + protected cd: ChangeDetectorRef, + private elementRef: ElementRef) { + super(cd); + } + + ngOnInit(): void { + super.ngOnInit(); + this.settings = {...sliderWidgetDefaultSettings, ...this.ctx.settings}; + + this.backgroundStyle$ = backgroundStyle(this.settings.background, this.imagePipe, this.sanitizer); + this.overlayStyle = overlayStyle(this.settings.background.overlay); + + this.layout = this.settings.layout; + + this.autoScale = this.settings.autoScale; + + this.showValue = this.layout !== SliderLayout.simplified && this.settings.showValue; + this.valueStyle = textStyle(this.settings.valueFont); + this.valueStyle.color = this.settings.valueColor; + + this.showLeftRightIcon = this.layout === SliderLayout.extended; + if (this.showLeftRightIcon) { + this.leftIcon = this.settings.leftIcon; + this.leftIconStyle = iconStyle(this.settings.leftIconSize, this.settings.leftIconSizeUnit ); + this.rightIcon = this.settings.rightIcon; + this.rightIconStyle = iconStyle(this.settings.rightIconSize, this.settings.rightIconSizeUnit ); + if (!this.autoScale) { + const leftIconMargin = this.settings.leftIconSize / 2 + (this.settings.leftIconSizeUnit || 'px'); + this.leftIconStyle.marginTop = `calc(-${leftIconMargin} + 3px)`; + const rightIconMargin = this.settings.rightIconSize / 2 + (this.settings.rightIconSizeUnit || 'px'); + this.rightIconStyle.marginTop = `calc(-${rightIconMargin} + 3px)`; + } + } + + this.showTicks = this.settings.showTicks; + if (this.showTicks) { + this.ticksStyle = textStyle(this.settings.ticksFont); + this.ticksStyle.color = this.settings.ticksColor; + } + + if (this.settings.showTickMarks) { + const range = this.settings.tickMax - this.settings.tickMin; + this.sliderStep = range / (this.settings.tickMarksCount - 1); + } + + const mainColorInstance = tinycolor(this.settings.mainColor); + const hoverRippleColor = mainColorInstance.clone().setAlpha(mainColorInstance.getAlpha() * 0.05).toRgbString(); + const focusRippleColor = mainColorInstance.clone().setAlpha(mainColorInstance.getAlpha() * 0.2).toRgbString(); + + const sliderVariablesCss = `.tb-slider-panel {\n`+ + `--tb-slider-main-color: ${this.settings.mainColor};\n`+ + `--tb-slider-background-color: ${this.settings.backgroundColor};\n`+ + `--tb-slider-hover-ripple-color: ${hoverRippleColor};\n`+ + `--tb-slider-focus-ripple-color: ${focusRippleColor};\n`+ + `--tb-slider-tick-marks-color: ${this.settings.tickMarksColor};\n`+ + `--tb-slider-main-color-disabled: ${this.settings.mainColorDisabled};\n`+ + `--tb-slider-background-disabled: ${this.settings.backgroundColorDisabled};\n`+ + `}`; + this.sliderCssClass = + this.utils.applyCssToElement(this.renderer, this.elementRef.nativeElement, 'tb-slider', sliderVariablesCss); + + const getInitialStateSettings = + {...this.settings.initialState, actionLabel: this.ctx.translate.instant('widgets.slider.initial-value')}; + this.createValueGetter(getInitialStateSettings, ValueType.INTEGER, { + next: (value) => this.onValue(value) + }); + + const disabledStateSettings = + {...this.settings.disabledState, actionLabel: this.ctx.translate.instant('widgets.rpc-state.disabled-state')}; + this.createValueGetter(disabledStateSettings, ValueType.BOOLEAN, { + next: (value) => this.onDisabled(value) + }); + + const valueChangeSettings = {...this.settings.valueChange, + actionLabel: this.ctx.translate.instant('widgets.slider.on-value-change')}; + this.valueSetter = this.createValueSetter(valueChangeSettings); + } + + ngAfterViewInit(): void { + if (this.autoScale) { + this.panelResize$ = new ResizeObserver(() => { + this.onResize(); + }); + this.panelResize$.observe(this.sliderContent.nativeElement); + if (this.showValue) { + this.panelResize$.observe(this.sliderValueContainer.nativeElement); + } + this.onResize(); + } + super.ngAfterViewInit(); + } + + ngOnDestroy() { + if (this.panelResize$) { + this.panelResize$.disconnect(); + } + if (this.sliderCssClass) { + this.utils.clearCssElement(this.renderer, this.sliderCssClass); + } + super.ngOnDestroy(); + } + + public onInit() { + super.onInit(); + const borderRadius = this.ctx.$widgetElement.css('borderRadius'); + this.overlayStyle = {...this.overlayStyle, ...{borderRadius}}; + this.cd.detectChanges(); + } + + public onSliderChange() { + this.updateValueText(); + if (!this.ctx.isEdit && !this.ctx.isPreview) { + const prevValue = this.prevValue; + const targetValue = this.value; + this.updateValue(this.valueSetter, targetValue, { + next: () => this.onValue(targetValue), + error: () => this.onValue(prevValue) + }); + } + } + + private _sliderValueText(value: number): string { + return formatValue(value, this.settings.valueDecimals, this.settings.valueUnits, false); + } + + private onValue(value: number): void { + this.value = value; + this.prevValue = value; + this.updateValueText(); + this.cd.markForCheck(); + } + + private updateValueText() { + if (isDefinedAndNotNull(this.value) && isNumeric(this.value)) { + this.valueText = formatValue(this.value, this.settings.valueDecimals, this.settings.valueUnits, false); + } else { + this.valueText = 'N/A'; + } + } + + private onDisabled(value: boolean): void { + this.disabled = !!value; + this.cd.markForCheck(); + } + + private onResize() { + const panelWidth = this.sliderContent.nativeElement.getBoundingClientRect().width; + const panelHeight = this.sliderContent.nativeElement.getBoundingClientRect().height; + + if (this.showValue) { + this.resetScale(this.sliderValueContainer.nativeElement, this.sliderValue.nativeElement); + } + + if (this.showLeftRightIcon) { + this.resetScale(this.leftSliderIconContainer.nativeElement, this.leftSliderIcon.nativeElement); + this.resetScale(this.rightSliderIconContainer.nativeElement, this.rightSliderIcon.nativeElement); + } + + if (this.showTicks) { + this.resetScale(this.sliderTickMinContainer.nativeElement, this.sliderTickMin.nativeElement); + this.resetScale(this.sliderTickMaxContainer.nativeElement, this.sliderTickMax.nativeElement); + } + + let minAspect = 0.2; + let avgContentHeight = 35; + if (this.showTicks) { + minAspect += 0.1; + avgContentHeight += 20; + } + if (this.showValue) { + minAspect += 0.1; + avgContentHeight += 50; + } + const aspect = Math.min(panelHeight / panelWidth, minAspect); + const targetHeight = panelWidth * aspect; + const scale = targetHeight / avgContentHeight; + + if (this.showValue) { + this.updateScale(this.sliderValueContainer.nativeElement, this.sliderValue.nativeElement, scale); + } + if (this.showLeftRightIcon) { + const leftIconContainerRect = this.leftSliderIconContainer.nativeElement.getBoundingClientRect(); + const leftIconContainerMarginTop = -(leftIconContainerRect.width * scale) / 2 + 3; + this.renderer.setStyle(this.leftSliderIconContainer.nativeElement, 'marginTop', `${leftIconContainerMarginTop}px`); + this.updateScale(this.leftSliderIconContainer.nativeElement, this.leftSliderIcon.nativeElement, scale, true); + const rightIconContainerRect = this.rightSliderIconContainer.nativeElement.getBoundingClientRect(); + const rightIconContainerMarginTop = -(rightIconContainerRect.width * scale) / 2 + 3; + this.renderer.setStyle(this.rightSliderIconContainer.nativeElement, 'marginTop', `${rightIconContainerMarginTop}px`); + this.updateScale(this.rightSliderIconContainer.nativeElement, this.rightSliderIcon.nativeElement, scale, true); + } + if (this.showTicks) { + this.updateScale(this.sliderTickMinContainer.nativeElement, this.sliderTickMin.nativeElement, scale); + this.updateScale(this.sliderTickMaxContainer.nativeElement, this.sliderTickMax.nativeElement, scale); + } + } + + private resetScale(container: HTMLElement, element: HTMLElement): void { + this.renderer.setStyle(container, 'width', ''); + this.renderer.setStyle(container, 'height', ''); + this.renderer.setStyle(element, 'transform', ''); + } + + private updateScale(container: HTMLElement, element: HTMLElement, scale: number, sameHeight = false): void { + const rect = container.getBoundingClientRect(); + this.renderer.setStyle(container, 'width', `${rect.width * scale}px`); + this.renderer.setStyle(container, 'height', `${(sameHeight ? rect.width : rect.height) * scale}px`); + this.renderer.setStyle(element, 'transform', `scale(${scale})`); + this.renderer.setStyle(element, 'transform-origin', 'left top'); + } + +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.models.ts new file mode 100644 index 0000000000..c6fe1e290a --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/rpc/slider-widget.models.ts @@ -0,0 +1,196 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { + DataToValueType, + GetValueAction, + GetValueSettings, + SetValueAction, + SetValueSettings, + ValueToDataType +} from '@shared/models/action-widget-settings.models'; +import { BackgroundSettings, BackgroundType, cssUnit, Font } from '@shared/models/widget-settings.models'; +import { AttributeScope } from '@shared/models/telemetry/telemetry.models'; + +export enum SliderLayout { + default = 'default', + extended = 'extended', + simplified = 'simplified' +} + +export const sliderLayouts = Object.keys(SliderLayout) as SliderLayout[]; + +export const sliderLayoutTranslations = new Map( + [ + [SliderLayout.default, 'widgets.slider.layout-default'], + [SliderLayout.extended, 'widgets.slider.layout-extended'], + [SliderLayout.simplified, 'widgets.slider.layout-simplified'] + ] +); + +export const sliderLayoutImages = new Map( + [ + [SliderLayout.default, 'assets/widget/slider/default-layout.svg'], + [SliderLayout.extended, 'assets/widget/slider/extended-layout.svg'], + [SliderLayout.simplified, 'assets/widget/slider/simplified-layout.svg'] + ] +); + +export interface SliderWidgetSettings { + initialState: GetValueSettings; + disabledState: GetValueSettings; + valueChange: SetValueSettings; + layout: SliderLayout; + autoScale: boolean; + showValue: boolean; + valueUnits: string; + valueDecimals: number; + valueFont: Font; + valueColor: string; + showTicks: boolean; + tickMin: number; + tickMax: number; + ticksFont: Font; + ticksColor: string; + showTickMarks: boolean; + tickMarksCount: number; + tickMarksColor: string; + mainColor: string; + backgroundColor: string; + mainColorDisabled: string; + backgroundColorDisabled: string; + leftIcon: string; + leftIconSize: number; + leftIconSizeUnit: cssUnit; + leftIconColor: string; + rightIcon: string; + rightIconSize: number; + rightIconSizeUnit: cssUnit; + rightIconColor: string; + background: BackgroundSettings; +} + +export const sliderWidgetDefaultSettings: SliderWidgetSettings = { + initialState: { + action: GetValueAction.EXECUTE_RPC, + defaultValue: 0, + executeRpc: { + method: 'getState', + requestTimeout: 5000, + requestPersistent: false, + persistentPollingInterval: 1000 + }, + getAttribute: { + key: 'state', + scope: null + }, + getTimeSeries: { + key: 'state' + }, + dataToValue: { + type: DataToValueType.NONE, + compareToValue: true, + dataToValueFunction: '/* Should return integer value */\nreturn data;' + } + }, + disabledState: { + action: GetValueAction.DO_NOTHING, + defaultValue: false, + getAttribute: { + key: 'state', + scope: null + }, + getTimeSeries: { + key: 'state' + }, + dataToValue: { + type: DataToValueType.NONE, + compareToValue: true, + dataToValueFunction: '/* Should return boolean value */\nreturn data;' + } + }, + valueChange: { + action: SetValueAction.EXECUTE_RPC, + executeRpc: { + method: 'setState', + requestTimeout: 5000, + requestPersistent: false, + persistentPollingInterval: 1000 + }, + setAttribute: { + key: 'state', + scope: AttributeScope.SHARED_SCOPE + }, + putTimeSeries: { + key: 'state' + }, + valueToData: { + type: ValueToDataType.VALUE, + constantValue: 0, + valueToDataFunction: '/* Convert input integer value to RPC parameters or attribute/time-series value */\nreturn value;' + } + }, + layout: SliderLayout.default, + autoScale: true, + showValue: true, + valueUnits: '%', + valueDecimals: 0, + valueFont: { + family: 'Roboto', + size: 36, + sizeUnit: 'px', + style: 'normal', + weight: '500', + lineHeight: '36px' + }, + valueColor: 'rgba(0, 0, 0, 0.87)', + showTicks: true, + tickMin: 0, + tickMax: 100, + ticksFont: { + family: 'Roboto', + size: 11, + sizeUnit: 'px', + style: 'normal', + weight: '400', + lineHeight: '16px' + }, + ticksColor: 'rgba(0,0,0,0.54)', + showTickMarks: true, + tickMarksCount: 11, + tickMarksColor: '#5469FF', + mainColor: '#5469FF', + backgroundColor: '#CCD2FF', + mainColorDisabled: '#9BA2B0', + backgroundColorDisabled: '#D5D7E5', + leftIcon: 'lightbulb', + leftIconSize: 24, + leftIconSizeUnit: 'px', + leftIconColor: '#5469FF', + rightIcon: 'mdi:lightbulb-on', + rightIconSize: 24, + rightIconSizeUnit: 'px', + rightIconColor: '#5469FF', + background: { + type: BackgroundType.color, + color: '#fff', + overlay: { + enabled: false, + color: 'rgba(255,255,255,0.72)', + blur: 3 + } + } +}; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/power-button-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/power-button-widget-settings.component.html index ced9bf9575..b37030c884 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/power-button-widget-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/power-button-widget-settings.component.html @@ -84,7 +84,7 @@
widgets.power-button.button
-
+
{{ 'widgets.power-button.power-on-colors' | translate }}
@@ -102,7 +102,7 @@
-
+
{{ 'widgets.power-button.power-off-colors' | translate }}
@@ -120,7 +120,7 @@
-
+
{{ 'widgets.power-button.disabled-colors' | translate }}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/progress-bar-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/progress-bar-widget-settings.component.html index de641b8808..31c8276666 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/progress-bar-widget-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/progress-bar-widget-settings.component.html @@ -35,7 +35,7 @@ {{ 'widgets.progress-bar.auto-scale' | translate }}
-
+
{{ 'widgets.progress-bar.value' | translate }} @@ -48,7 +48,7 @@
-
+
{{ 'widgets.progress-bar.range' | translate }}
widgets.progress-bar.min
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html index b1fccafac0..4cf5857612 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html @@ -97,7 +97,8 @@
{{ (setValueSettingsFormGroup.get('action').value === setValueAction.EXECUTE_RPC ? 'widgets.value-action.parameters' : 'widgets.value-action.value') | translate }}
- {{ 'widgets.value-action.converter-constant' | translate }} + {{ 'widgets.value-action.converter-value' | translate }} + {{ 'widgets.value-action.converter-constant' | translate }} {{ 'widgets.value-action.converter-function' | translate }} {{ 'widgets.value-action.converter-none' | translate }} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts index d718168b11..819ed2a3fc 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts @@ -32,6 +32,7 @@ import { TargetDevice, widgetType } from '@shared/models/widget.models'; import { AttributeScope, DataKeyType, telemetryTypeTranslationsShort } from '@shared/models/telemetry/telemetry.models'; import { IAliasController } from '@core/api/widget-api.models'; import { WidgetService } from '@core/http/widget.service'; +import { ValueType } from '@shared/models/constants'; @Component({ selector: 'tb-set-value-action-settings-panel', @@ -45,6 +46,9 @@ export class SetValueActionSettingsPanelComponent extends PageComponent implemen @Input() panelTitle: string; + @Input() + valueType = ValueType.BOOLEAN; + @Input() setValueSettings: SetValueSettings; @@ -79,6 +83,8 @@ export class SetValueActionSettingsPanelComponent extends PageComponent implemen functionScopeVariables = this.widgetService.getWidgetScopeVariables(); + ValueType = ValueType; + setValueSettingsFormGroup: UntypedFormGroup; constructor(private fb: UntypedFormBuilder, diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts index fce1e23673..7b4c8e0428 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts @@ -36,6 +36,7 @@ import { isDefinedAndNotNull } from '@core/utils'; import { SetValueActionSettingsPanelComponent } from '@home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component'; +import { ValueType } from '@shared/models/constants'; @Component({ selector: 'tb-set-value-action-settings', @@ -58,6 +59,9 @@ export class SetValueActionSettingsComponent implements OnInit, ControlValueAcce @Input() panelTitle: string; + @Input() + valueType = ValueType.BOOLEAN; + @Input() aliasController: IAliasController; @@ -114,6 +118,7 @@ export class SetValueActionSettingsComponent implements OnInit, ControlValueAcce const ctx: any = { setValueSettings: this.modelValue, panelTitle: this.panelTitle, + valueType: this.valueType, aliasController: this.aliasController, targetDevice: this.targetDevice, widgetType: this.widgetType @@ -137,6 +142,9 @@ export class SetValueActionSettingsComponent implements OnInit, ControlValueAcce private updateDisplayValue() { let value: any; switch (this.modelValue.valueToData.type) { + case ValueToDataType.VALUE: + value = 'value'; + break; case ValueToDataType.CONSTANT: value = this.modelValue.valueToData.constantValue; break; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html index b4ce9c8ce2..bdecc9d36b 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html @@ -56,7 +56,7 @@
-
+
{{ 'widgets.button.color-palette' | translate }}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html index 9350c2d932..9208efd68a 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html @@ -81,7 +81,7 @@ {{ 'widgets.single-switch.auto-scale' | translate }}
-
+
{{ 'widgets.single-switch.label' | translate }} @@ -98,7 +98,7 @@
-
+
{{ 'widgets.single-switch.icon' | translate }} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.html new file mode 100644 index 0000000000..0f3c3f11a3 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.html @@ -0,0 +1,216 @@ + + +
+
widgets.slider.behavior
+
+
widgets.slider.initial-value
+ +
+
+
widgets.slider.on-value-change
+ +
+
+
widgets.rpc-state.disabled-state
+ +
+
+
+
widget-config.card-style
+ + + {{ sliderLayoutTranslationMap.get(layout) | translate }} + + +
+ + {{ 'widgets.slider.auto-scale' | translate }} + +
+
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+
+
widgets.slider.slider
+
+ + {{ 'widgets.slider.value' | translate }} + +
+ + + +
widget-config.decimals-suffix
+
+ + + + +
+
+
+
{{ 'widgets.slider.range' | translate }}
+
+
widgets.slider.min
+ + + +
widgets.slider.max
+ + + +
+
+
+ + {{ 'widgets.slider.range-ticks' | translate }} + +
+ + + + +
+
+
+ + {{ 'widgets.slider.tick-marks' | translate }} + +
+ + + + + +
+
+
+
{{ 'widgets.slider.colors' | translate }}
+
+
+
widgets.slider.main
+ + +
+ +
+
widgets.slider.background
+ + +
+
+
+
+
{{ 'widgets.rpc-state.disabled-state' | translate }}
+
+
+
widgets.slider.main
+ + +
+ +
+
widgets.slider.background
+ + +
+
+
+
+
+ {{ 'widgets.slider.left-icon' | translate }} +
+
+ + + + + + + + +
+
+
+
+ {{ 'widgets.slider.right-icon' | translate }} +
+
+ + + + + + + + +
+
+
+
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.ts new file mode 100644 index 0000000000..a215a93d88 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slider-widget-settings.component.ts @@ -0,0 +1,186 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { Component } from '@angular/core'; +import { TargetDevice, WidgetSettings, WidgetSettingsComponent, widgetType } from '@shared/models/widget.models'; +import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { ValueType } from '@shared/models/constants'; +import { + SliderLayout, + sliderLayoutImages, + sliderLayouts, + sliderLayoutTranslations, + sliderWidgetDefaultSettings +} from '@home/components/widget/lib/rpc/slider-widget.models'; +import { formatValue } from '@core/utils'; + +@Component({ + selector: 'tb-slider-widget-settings', + templateUrl: './slider-widget-settings.component.html', + styleUrls: ['./../widget-settings.scss'] +}) +export class SliderWidgetSettingsComponent extends WidgetSettingsComponent { + + get targetDevice(): TargetDevice { + return this.widgetConfig?.config?.targetDevice; + } + + get widgetType(): widgetType { + return this.widgetConfig?.widgetType; + } + + sliderLayout = SliderLayout; + + sliderLayouts = sliderLayouts; + + sliderLayoutTranslationMap = sliderLayoutTranslations; + sliderLayoutImageMap = sliderLayoutImages; + + valueType = ValueType; + + sliderWidgetSettingsForm: UntypedFormGroup; + + valuePreviewFn = this._valuePreviewFn.bind(this); + + constructor(protected store: Store, + private fb: UntypedFormBuilder) { + super(store); + } + + protected settingsForm(): UntypedFormGroup { + return this.sliderWidgetSettingsForm; + } + + protected defaultSettings(): WidgetSettings { + return {...sliderWidgetDefaultSettings}; + } + + protected onSettingsSet(settings: WidgetSettings) { + this.sliderWidgetSettingsForm = this.fb.group({ + initialState: [settings.initialState, []], + valueChange: [settings.valueChange, []], + disabledState: [settings.disabledState, []], + + layout: [settings.layout, []], + autoScale: [settings.autoScale, []], + + showValue: [settings.showValue, []], + valueUnits: [settings.valueUnits, []], + valueDecimals: [settings.valueDecimals, []], + valueFont: [settings.valueFont, []], + valueColor: [settings.valueColor, []], + + tickMin: [settings.tickMin, []], + tickMax: [settings.tickMax, []], + + showTicks: [settings.showTicks, []], + ticksFont: [settings.ticksFont, []], + ticksColor: [settings.ticksColor, []], + + showTickMarks: [settings.showTickMarks, []], + tickMarksCount: [settings.tickMarksCount, [Validators.min(2)]], + tickMarksColor: [settings.tickMarksColor, []], + + mainColor: [settings.mainColor, []], + backgroundColor: [settings.backgroundColor, []], + + mainColorDisabled: [settings.mainColorDisabled, []], + backgroundColorDisabled: [settings.backgroundColorDisabled, []], + + leftIconSize: [settings.leftIconSize, [Validators.min(0)]], + leftIconSizeUnit: [settings.leftIconSizeUnit, []], + leftIcon: [settings.leftIcon, []], + leftIconColor: [settings.leftIconColor, []], + + rightIconSize: [settings.rightIconSize, [Validators.min(0)]], + rightIconSizeUnit: [settings.rightIconSizeUnit, []], + rightIcon: [settings.rightIcon, []], + rightIconColor: [settings.rightIconColor, []], + + background: [settings.background, []], + }); + } + + protected validatorTriggers(): string[] { + return ['showValue', 'showTicks', 'showTickMarks', 'layout']; + } + + protected updateValidators(_emitEvent: boolean): void { + const showValue: boolean = this.sliderWidgetSettingsForm.get('showValue').value; + const showTicks: boolean = this.sliderWidgetSettingsForm.get('showTicks').value; + const showTickMarks: boolean = this.sliderWidgetSettingsForm.get('showTickMarks').value; + const layout: SliderLayout = this.sliderWidgetSettingsForm.get('layout').value; + + const valueEnabled = layout !== SliderLayout.simplified; + const leftRightIconsEnabled = layout === SliderLayout.extended; + + if (valueEnabled && showValue) { + this.sliderWidgetSettingsForm.get('valueUnits').enable(); + this.sliderWidgetSettingsForm.get('valueDecimals').enable(); + this.sliderWidgetSettingsForm.get('valueFont').enable(); + this.sliderWidgetSettingsForm.get('valueColor').enable(); + } else { + this.sliderWidgetSettingsForm.get('valueUnits').disable(); + this.sliderWidgetSettingsForm.get('valueDecimals').disable(); + this.sliderWidgetSettingsForm.get('valueFont').disable(); + this.sliderWidgetSettingsForm.get('valueColor').disable(); + } + + if (showTicks) { + this.sliderWidgetSettingsForm.get('ticksFont').enable(); + this.sliderWidgetSettingsForm.get('ticksColor').enable(); + } else { + this.sliderWidgetSettingsForm.get('ticksFont').disable(); + this.sliderWidgetSettingsForm.get('ticksColor').disable(); + } + + if (showTickMarks) { + this.sliderWidgetSettingsForm.get('tickMarksCount').enable(); + this.sliderWidgetSettingsForm.get('tickMarksColor').enable(); + } else { + this.sliderWidgetSettingsForm.get('tickMarksCount').disable(); + this.sliderWidgetSettingsForm.get('tickMarksColor').disable(); + } + + if (leftRightIconsEnabled) { + this.sliderWidgetSettingsForm.get('leftIconSize').enable(); + this.sliderWidgetSettingsForm.get('leftIconSizeUnit').enable(); + this.sliderWidgetSettingsForm.get('leftIcon').enable(); + this.sliderWidgetSettingsForm.get('leftIconColor').enable(); + this.sliderWidgetSettingsForm.get('rightIconSize').enable(); + this.sliderWidgetSettingsForm.get('rightIconSizeUnit').enable(); + this.sliderWidgetSettingsForm.get('rightIcon').enable(); + this.sliderWidgetSettingsForm.get('rightIconColor').enable(); + } else { + this.sliderWidgetSettingsForm.get('leftIconSize').disable(); + this.sliderWidgetSettingsForm.get('leftIconSizeUnit').disable(); + this.sliderWidgetSettingsForm.get('leftIcon').disable(); + this.sliderWidgetSettingsForm.get('leftIconColor').disable(); + this.sliderWidgetSettingsForm.get('rightIconSize').disable(); + this.sliderWidgetSettingsForm.get('rightIconSizeUnit').disable(); + this.sliderWidgetSettingsForm.get('rightIcon').disable(); + this.sliderWidgetSettingsForm.get('rightIconColor').disable(); + } + } + + private _valuePreviewFn(): string { + const units: string = this.sliderWidgetSettingsForm.get('valueUnits').value; + const decimals: number = this.sliderWidgetSettingsForm.get('valueDecimals').value; + return formatValue(48, decimals, units, false); + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts index d3fe9dac3e..8fc6ef96c2 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts @@ -324,6 +324,9 @@ import { import { PowerButtonWidgetSettingsComponent } from '@home/components/widget/lib/settings/button/power-button-widget-settings.component'; +import { + SliderWidgetSettingsComponent +} from '@home/components/widget/lib/settings/control/slider-widget-settings.component'; @NgModule({ declarations: [ @@ -440,7 +443,8 @@ import { SingleSwitchWidgetSettingsComponent, ActionButtonWidgetSettingsComponent, CommandButtonWidgetSettingsComponent, - PowerButtonWidgetSettingsComponent + PowerButtonWidgetSettingsComponent, + SliderWidgetSettingsComponent ], imports: [ CommonModule, @@ -562,7 +566,8 @@ import { SingleSwitchWidgetSettingsComponent, ActionButtonWidgetSettingsComponent, CommandButtonWidgetSettingsComponent, - PowerButtonWidgetSettingsComponent + PowerButtonWidgetSettingsComponent, + SliderWidgetSettingsComponent ] }) export class WidgetSettingsModule { @@ -651,5 +656,6 @@ export const widgetSettingsComponentsMap: {[key: string]: Type { if (this.snackBarRef) { this.snackBarRef.dismiss(); diff --git a/ui-ngx/src/app/shared/models/action-widget-settings.models.ts b/ui-ngx/src/app/shared/models/action-widget-settings.models.ts index d7f4710f8d..a019f086dd 100644 --- a/ui-ngx/src/app/shared/models/action-widget-settings.models.ts +++ b/ui-ngx/src/app/shared/models/action-widget-settings.models.ts @@ -111,6 +111,7 @@ export const setValueActionTranslations = new Map( ); export enum ValueToDataType { + VALUE = 'VALUE', CONSTANT = 'CONSTANT', FUNCTION = 'FUNCTION', NONE = 'NONE' diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 19981797f8..c71f33fca7 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -6342,6 +6342,31 @@ "off-label": "Off label", "switch": "Switch" }, + "slider": { + "behavior": "Behavior", + "initial-value": "Initial value", + "initial-value-hint": "Action to get the initial value of the slider.", + "on-value-change": "On value change", + "on-value-change-hint": "Action triggered when the slider value is changed.", + "layout": "Layout", + "layout-default": "Default", + "layout-extended": "Extended", + "layout-simplified": "Simplified", + "auto-scale": "Auto scale", + "icon": "Icon", + "value": "Value", + "range": "Range", + "min": "min", + "max": "max", + "range-ticks": "Range ticks", + "tick-marks": "Tick marks", + "colors": "Colors", + "main": "Main", + "background": "Background", + "left-icon": "Left icon", + "right-icon": "Right icon", + "slider": "Slider" + }, "value-card": { "layout": "Layout", "layout-square": "Square", @@ -6613,6 +6638,7 @@ "converter-none": "None", "converter-function": "Function", "converter-constant": "Constant", + "converter-value": "Value", "parse-value-function": "Parse value function", "state-when-result-is": "'{{state}}' when result is", "parameters": "Parameters", diff --git a/ui-ngx/src/assets/widget/slider/default-layout.svg b/ui-ngx/src/assets/widget/slider/default-layout.svg new file mode 100644 index 0000000000..0b6d1bce33 --- /dev/null +++ b/ui-ngx/src/assets/widget/slider/default-layout.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/widget/slider/extended-layout.svg b/ui-ngx/src/assets/widget/slider/extended-layout.svg new file mode 100644 index 0000000000..923ee8af3d --- /dev/null +++ b/ui-ngx/src/assets/widget/slider/extended-layout.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui-ngx/src/assets/widget/slider/simplified-layout.svg b/ui-ngx/src/assets/widget/slider/simplified-layout.svg new file mode 100644 index 0000000000..d2e3936db0 --- /dev/null +++ b/ui-ngx/src/assets/widget/slider/simplified-layout.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +