From 823b13f4bc506c0bccffc1cd8c659af5b6cbbc95 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 24 Jun 2024 12:58:33 +0300 Subject: [PATCH] UI: Add settings for 'Label & value card' widget. --- .../widget_types/label___value_card.json | 12 +- .../basic/basic-widget-config.module.ts | 12 +- ...bel-value-card-basic-config.component.html | 114 +++++++++++ ...label-value-card-basic-config.component.ts | 191 ++++++++++++++++++ .../label-value-card-widget.component.ts | 2 - .../label-card-widget-settings.component.ts | 3 +- ...-value-card-widget-settings.component.html | 81 ++++++++ ...el-value-card-widget-settings.component.ts | 108 ++++++++++ .../lib/settings/widget-settings.module.ts | 12 +- .../assets/locale/locale.constant-en_US.json | 4 + 10 files changed, 524 insertions(+), 15 deletions(-) create mode 100644 ui-ngx/src/app/modules/home/components/widget/config/basic/cards/label-value-card-basic-config.component.html create mode 100644 ui-ngx/src/app/modules/home/components/widget/config/basic/cards/label-value-card-basic-config.component.ts create mode 100644 ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.html create mode 100644 ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.ts diff --git a/application/src/main/data/json/system/widget_types/label___value_card.json b/application/src/main/data/json/system/widget_types/label___value_card.json index 57e26d3050..e9ec9bae73 100644 --- a/application/src/main/data/json/system/widget_types/label___value_card.json +++ b/application/src/main/data/json/system/widget_types/label___value_card.json @@ -2,7 +2,7 @@ "fqn": "label_value_card", "name": "Label & value card", "deprecated": false, - "image": null, + "image": "tb-image:bGFiZWxWYWx1ZUNhcmQuc3Zn:IkxhYmVsICYgdmFsdWUgY2FyZCIgc3lzdGVtIHdpZGdldCBpbWFnZQ==;data:image/svg+xml;base64,<svg width="212" height="160" viewBox="0 0 212 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d_4988_45056)">
<rect x="6" y="52" width="200" height="56" rx="4" fill="white"/>
<g filter="url(#filter1_b_4988_45056)">
<rect x="18" y="64" width="176" height="32" rx="4" fill="white" fill-opacity="0.76"/>
</g>
<path d="M39.5 81V73C39.5 71.34 38.16 70 36.5 70C34.84 70 33.5 71.34 33.5 73V81C32.29 81.91 31.5 83.37 31.5 85C31.5 87.76 33.74 90 36.5 90C39.26 90 41.5 87.76 41.5 85C41.5 83.37 40.71 81.91 39.5 81ZM35.5 73C35.5 72.45 35.95 72 36.5 72C37.05 72 37.5 72.45 37.5 73H36.5V74H37.5V76H36.5V77H37.5V79H35.5V73Z" fill="#5469FF"/>
<path d="M61.6064 75.0469V85H59.9043V75.0469H61.6064ZM64.7305 75.0469V76.4141H56.8076V75.0469H64.7305ZM68.7334 85.1367C68.1865 85.1367 67.6921 85.0479 67.25 84.8701C66.8125 84.6878 66.4388 84.4349 66.1289 84.1113C65.8236 83.7878 65.5889 83.4072 65.4248 82.9697C65.2607 82.5322 65.1787 82.0605 65.1787 81.5547V81.2812C65.1787 80.7025 65.263 80.1784 65.4316 79.709C65.6003 79.2396 65.835 78.8385 66.1357 78.5059C66.4365 78.1686 66.792 77.9111 67.2021 77.7334C67.6123 77.5557 68.0566 77.4668 68.5352 77.4668C69.0638 77.4668 69.5264 77.5557 69.9229 77.7334C70.3193 77.9111 70.6475 78.1618 70.9072 78.4854C71.1715 78.8044 71.3675 79.1849 71.4951 79.627C71.6273 80.069 71.6934 80.5566 71.6934 81.0898V81.7939H65.9785V80.6113H70.0664V80.4814C70.0573 80.1852 69.998 79.9072 69.8887 79.6475C69.7839 79.3877 69.6221 79.1781 69.4033 79.0186C69.1846 78.859 68.8929 78.7793 68.5283 78.7793C68.2549 78.7793 68.0111 78.8385 67.7969 78.957C67.5872 79.071 67.4118 79.2373 67.2705 79.4561C67.1292 79.6748 67.0199 79.9391 66.9424 80.249C66.8695 80.5544 66.833 80.8984 66.833 81.2812V81.5547C66.833 81.8783 66.8763 82.179 66.9629 82.457C67.054 82.7305 67.1862 82.9697 67.3594 83.1748C67.5326 83.3799 67.7422 83.5417 67.9883 83.6602C68.2344 83.7741 68.5146 83.8311 68.8291 83.8311C69.2256 83.8311 69.5788 83.7513 69.8887 83.5918C70.1986 83.4323 70.4674 83.2067 70.6953 82.915L71.5635 83.7559C71.404 83.9883 71.1966 84.2116 70.9414 84.4258C70.6862 84.6354 70.374 84.8063 70.0049 84.9385C69.6403 85.0706 69.2165 85.1367 68.7334 85.1367ZM74.876 79.1074V85H73.2285V77.6035H74.7803L74.876 79.1074ZM74.6094 81.0283L74.0488 81.0215C74.0488 80.5111 74.1126 80.0394 74.2402 79.6064C74.3678 79.1735 74.5547 78.7975 74.8008 78.4785C75.0469 78.1549 75.3522 77.9066 75.7168 77.7334C76.0859 77.5557 76.512 77.4668 76.9951 77.4668C77.3324 77.4668 77.64 77.5169 77.918 77.6172C78.2005 77.7129 78.4443 77.8656 78.6494 78.0752C78.859 78.2848 79.0186 78.5537 79.1279 78.8818C79.2419 79.21 79.2988 79.6064 79.2988 80.0713V85H77.6514V80.2148C77.6514 79.8548 77.5967 79.5723 77.4873 79.3672C77.3825 79.1621 77.2298 79.0163 77.0293 78.9297C76.8333 78.8385 76.5986 78.793 76.3252 78.793C76.0153 78.793 75.751 78.8522 75.5322 78.9707C75.318 79.0892 75.1426 79.251 75.0059 79.4561C74.8691 79.6611 74.7689 79.8981 74.7051 80.167C74.6413 80.4359 74.6094 80.723 74.6094 81.0283ZM79.1963 80.5908L78.4238 80.7617C78.4238 80.3151 78.4854 79.8936 78.6084 79.4971C78.736 79.096 78.9206 78.7451 79.1621 78.4443C79.4082 78.139 79.7113 77.8997 80.0713 77.7266C80.4313 77.5534 80.8438 77.4668 81.3086 77.4668C81.6868 77.4668 82.0241 77.5192 82.3203 77.624C82.6211 77.7243 82.8763 77.8838 83.0859 78.1025C83.2956 78.3213 83.4551 78.6061 83.5645 78.957C83.6738 79.3034 83.7285 79.7227 83.7285 80.2148V85H82.0742V80.208C82.0742 79.8343 82.0195 79.5449 81.9102 79.3398C81.8053 79.1348 81.6549 78.9935 81.459 78.916C81.263 78.834 81.0283 78.793 80.7549 78.793C80.4997 78.793 80.2741 78.8408 80.0781 78.9365C79.8867 79.0277 79.7249 79.1576 79.5928 79.3262C79.4606 79.4902 79.3604 79.6794 79.292 79.8936C79.2282 80.1077 79.1963 80.3402 79.1963 80.5908ZM87.3281 79.0254V87.8438H85.6807V77.6035H87.1982L87.3281 79.0254ZM92.1475 81.2334V81.377C92.1475 81.9147 92.0837 82.4137 91.9561 82.874C91.833 83.3298 91.6484 83.7285 91.4023 84.0703C91.1608 84.4076 90.8623 84.6696 90.5068 84.8564C90.1514 85.0433 89.7412 85.1367 89.2764 85.1367C88.8161 85.1367 88.4128 85.0524 88.0664 84.8838C87.7246 84.7106 87.4352 84.4668 87.1982 84.1523C86.9613 83.8379 86.7699 83.4688 86.624 83.0449C86.4827 82.6165 86.3825 82.1471 86.3232 81.6367V81.083C86.3825 80.5407 86.4827 80.0485 86.624 79.6064C86.7699 79.1644 86.9613 78.7839 87.1982 78.4648C87.4352 78.1458 87.7246 77.8997 88.0664 77.7266C88.4082 77.5534 88.807 77.4668 89.2627 77.4668C89.7275 77.4668 90.14 77.5579 90.5 77.7402C90.86 77.918 91.1631 78.1732 91.4092 78.5059C91.6553 78.834 91.8398 79.2305 91.9629 79.6953C92.0859 80.1556 92.1475 80.6683 92.1475 81.2334ZM90.5 81.377V81.2334C90.5 80.8916 90.4681 80.5749 90.4043 80.2832C90.3405 79.987 90.2402 79.7272 90.1035 79.5039C89.9668 79.2806 89.7913 79.1074 89.5771 78.9844C89.3675 78.8568 89.1146 78.793 88.8184 78.793C88.5267 78.793 88.276 78.8431 88.0664 78.9434C87.8568 79.0391 87.6813 79.1735 87.54 79.3467C87.3988 79.5199 87.2894 79.7227 87.2119 79.9551C87.1344 80.1829 87.0798 80.4313 87.0479 80.7002V82.0264C87.1025 82.3545 87.196 82.6553 87.3281 82.9287C87.4603 83.2021 87.6471 83.4209 87.8887 83.585C88.1348 83.7445 88.4492 83.8242 88.832 83.8242C89.1283 83.8242 89.3812 83.7604 89.5908 83.6328C89.8005 83.5052 89.9714 83.3298 90.1035 83.1064C90.2402 82.8786 90.3405 82.6165 90.4043 82.3203C90.4681 82.0241 90.5 81.7096 90.5 81.377ZM97.0596 85.1367C96.5127 85.1367 96.0182 85.0479 95.5762 84.8701C95.1387 84.6878 94.765 84.4349 94.4551 84.1113C94.1497 83.7878 93.915 83.4072 93.751 82.9697C93.5869 82.5322 93.5049 82.0605 93.5049 81.5547V81.2812C93.5049 80.7025 93.5892 80.1784 93.7578 79.709C93.9264 79.2396 94.1611 78.8385 94.4619 78.5059C94.7627 78.1686 95.1182 77.9111 95.5283 77.7334C95.9385 77.5557 96.3828 77.4668 96.8613 77.4668C97.39 77.4668 97.8525 77.5557 98.249 77.7334C98.6455 77.9111 98.9736 78.1618 99.2334 78.4854C99.4977 78.8044 99.6937 79.1849 99.8213 79.627C99.9535 80.069 100.02 80.5566 100.02 81.0898V81.7939H94.3047V80.6113H98.3926V80.4814C98.3835 80.1852 98.3242 79.9072 98.2148 79.6475C98.11 79.3877 97.9482 79.1781 97.7295 79.0186C97.5107 78.859 97.2191 78.7793 96.8545 78.7793C96.5811 78.7793 96.3372 78.8385 96.123 78.957C95.9134 79.071 95.738 79.2373 95.5967 79.4561C95.4554 79.6748 95.346 79.9391 95.2686 80.249C95.1956 80.5544 95.1592 80.8984 95.1592 81.2812V81.5547C95.1592 81.8783 95.2025 82.179 95.2891 82.457C95.3802 82.7305 95.5124 82.9697 95.6855 83.1748C95.8587 83.3799 96.0684 83.5417 96.3145 83.6602C96.5605 83.7741 96.8408 83.8311 97.1553 83.8311C97.5518 83.8311 97.9049 83.7513 98.2148 83.5918C98.5247 83.4323 98.7936 83.2067 99.0215 82.915L99.8896 83.7559C99.7301 83.9883 99.5228 84.2116 99.2676 84.4258C99.0124 84.6354 98.7002 84.8063 98.3311 84.9385C97.9665 85.0706 97.5426 85.1367 97.0596 85.1367ZM103.209 79.0117V85H101.562V77.6035H103.134L103.209 79.0117ZM105.472 77.5557L105.458 79.0869C105.358 79.0687 105.248 79.055 105.13 79.0459C105.016 79.0368 104.902 79.0322 104.788 79.0322C104.506 79.0322 104.257 79.0732 104.043 79.1553C103.829 79.2327 103.649 79.3467 103.503 79.4971C103.362 79.6429 103.252 79.8206 103.175 80.0303C103.097 80.2399 103.052 80.4746 103.038 80.7344L102.662 80.7617C102.662 80.2969 102.708 79.8662 102.799 79.4697C102.89 79.0732 103.027 78.7246 103.209 78.4238C103.396 78.123 103.628 77.8883 103.906 77.7197C104.189 77.5511 104.515 77.4668 104.884 77.4668C104.984 77.4668 105.091 77.4759 105.205 77.4941C105.324 77.5124 105.412 77.5329 105.472 77.5557ZM110.678 83.5166V79.9893C110.678 79.7249 110.63 79.4971 110.534 79.3057C110.438 79.1143 110.293 78.9661 110.097 78.8613C109.905 78.7565 109.664 78.7041 109.372 78.7041C109.103 78.7041 108.871 78.7497 108.675 78.8408C108.479 78.932 108.326 79.055 108.217 79.21C108.107 79.3649 108.053 79.5404 108.053 79.7363H106.412C106.412 79.4447 106.483 79.1621 106.624 78.8887C106.765 78.6152 106.97 78.3714 107.239 78.1572C107.508 77.943 107.829 77.7744 108.203 77.6514C108.577 77.5283 108.996 77.4668 109.461 77.4668C110.017 77.4668 110.509 77.5602 110.938 77.7471C111.37 77.9339 111.71 78.2165 111.956 78.5947C112.207 78.9684 112.332 79.4378 112.332 80.0029V83.291C112.332 83.6283 112.355 83.9313 112.4 84.2002C112.451 84.4645 112.521 84.6947 112.612 84.8906V85H110.924C110.846 84.8223 110.785 84.5967 110.739 84.3232C110.698 84.0452 110.678 83.7764 110.678 83.5166ZM110.917 80.502L110.931 81.5205H109.748C109.443 81.5205 109.174 81.5501 108.941 81.6094C108.709 81.6641 108.515 81.7461 108.36 81.8555C108.205 81.9648 108.089 82.097 108.012 82.252C107.934 82.4069 107.896 82.5824 107.896 82.7783C107.896 82.9743 107.941 83.1543 108.032 83.3184C108.123 83.4779 108.256 83.6032 108.429 83.6943C108.606 83.7855 108.821 83.8311 109.071 83.8311C109.409 83.8311 109.702 83.7627 109.953 83.626C110.208 83.4847 110.409 83.3138 110.555 83.1133C110.701 82.9082 110.778 82.7145 110.787 82.5322L111.32 83.2637C111.266 83.4505 111.172 83.651 111.04 83.8652C110.908 84.0794 110.735 84.2845 110.521 84.4805C110.311 84.6719 110.058 84.8291 109.762 84.9521C109.47 85.0752 109.133 85.1367 108.75 85.1367C108.267 85.1367 107.836 85.041 107.458 84.8496C107.08 84.6536 106.784 84.3916 106.569 84.0635C106.355 83.7308 106.248 83.3548 106.248 82.9355C106.248 82.5436 106.321 82.1973 106.467 81.8965C106.617 81.5911 106.836 81.3359 107.123 81.1309C107.415 80.9258 107.77 80.7708 108.189 80.666C108.609 80.5566 109.087 80.502 109.625 80.502H110.917ZM117.695 77.6035V78.8066H113.525V77.6035H117.695ZM114.729 75.792H116.376V82.9561C116.376 83.1839 116.408 83.3594 116.472 83.4824C116.54 83.6009 116.633 83.6807 116.752 83.7217C116.87 83.7627 117.009 83.7832 117.169 83.7832C117.283 83.7832 117.392 83.7764 117.497 83.7627C117.602 83.749 117.686 83.7354 117.75 83.7217L117.757 84.9795C117.62 85.0205 117.461 85.057 117.278 85.0889C117.101 85.1208 116.896 85.1367 116.663 85.1367C116.285 85.1367 115.95 85.0706 115.658 84.9385C115.367 84.8018 115.139 84.5807 114.975 84.2754C114.811 83.9701 114.729 83.5645 114.729 83.0586V75.792ZM123.667 83.2568V77.6035H125.321V85H123.763L123.667 83.2568ZM123.899 81.7188L124.453 81.7051C124.453 82.2018 124.398 82.6598 124.289 83.0791C124.18 83.4938 124.011 83.8561 123.783 84.166C123.555 84.4714 123.264 84.7106 122.908 84.8838C122.553 85.0524 122.127 85.1367 121.63 85.1367C121.27 85.1367 120.939 85.0843 120.639 84.9795C120.338 84.8747 120.078 84.7129 119.859 84.4941C119.645 84.2754 119.479 83.9906 119.36 83.6396C119.242 83.2887 119.183 82.8695 119.183 82.3818V77.6035H120.83V82.3955C120.83 82.6644 120.862 82.89 120.926 83.0723C120.99 83.25 121.076 83.3936 121.186 83.5029C121.295 83.6123 121.423 83.6898 121.568 83.7354C121.714 83.7809 121.869 83.8037 122.033 83.8037C122.503 83.8037 122.872 83.7126 123.141 83.5303C123.414 83.3434 123.608 83.0928 123.722 82.7783C123.84 82.4639 123.899 82.1107 123.899 81.7188ZM128.914 79.0117V85H127.267V77.6035H128.839L128.914 79.0117ZM131.177 77.5557L131.163 79.0869C131.063 79.0687 130.953 79.055 130.835 79.0459C130.721 79.0368 130.607 79.0322 130.493 79.0322C130.211 79.0322 129.962 79.0732 129.748 79.1553C129.534 79.2327 129.354 79.3467 129.208 79.4971C129.067 79.6429 128.957 79.8206 128.88 80.0303C128.802 80.2399 128.757 80.4746 128.743 80.7344L128.367 80.7617C128.367 80.2969 128.413 79.8662 128.504 79.4697C128.595 79.0732 128.732 78.7246 128.914 78.4238C129.101 78.123 129.333 77.8883 129.611 77.7197C129.894 77.5511 130.22 77.4668 130.589 77.4668C130.689 77.4668 130.796 77.4759 130.91 77.4941C131.029 77.5124 131.118 77.5329 131.177 77.5557ZM135.583 85.1367C135.036 85.1367 134.542 85.0479 134.1 84.8701C133.662 84.6878 133.288 84.4349 132.979 84.1113C132.673 83.7878 132.438 83.4072 132.274 82.9697C132.11 82.5322 132.028 82.0605 132.028 81.5547V81.2812C132.028 80.7025 132.113 80.1784 132.281 79.709C132.45 79.2396 132.685 78.8385 132.985 78.5059C133.286 78.1686 133.642 77.9111 134.052 77.7334C134.462 77.5557 134.906 77.4668 135.385 77.4668C135.913 77.4668 136.376 77.5557 136.772 77.7334C137.169 77.9111 137.497 78.1618 137.757 78.4854C138.021 78.8044 138.217 79.1849 138.345 79.627C138.477 80.069 138.543 80.5566 138.543 81.0898V81.7939H132.828V80.6113H136.916V80.4814C136.907 80.1852 136.848 79.9072 136.738 79.6475C136.633 79.3877 136.472 79.1781 136.253 79.0186C136.034 78.859 135.743 78.7793 135.378 78.7793C135.104 78.7793 134.861 78.8385 134.646 78.957C134.437 79.071 134.261 79.2373 134.12 79.4561C133.979 79.6748 133.869 79.9391 133.792 80.249C133.719 80.5544 133.683 80.8984 133.683 81.2812V81.5547C133.683 81.8783 133.726 82.179 133.812 82.457C133.904 82.7305 134.036 82.9697 134.209 83.1748C134.382 83.3799 134.592 83.5417 134.838 83.6602C135.084 83.7741 135.364 83.8311 135.679 83.8311C136.075 83.8311 136.428 83.7513 136.738 83.5918C137.048 83.4323 137.317 83.2067 137.545 82.915L138.413 83.7559C138.254 83.9883 138.046 84.2116 137.791 84.4258C137.536 84.6354 137.224 84.8063 136.854 84.9385C136.49 85.0706 136.066 85.1367 135.583 85.1367Z" fill="black" fill-opacity="0.87"/>
<path d="M162.924 83.6875V85H156.252V83.8721L159.492 80.3379C159.848 79.9368 160.128 79.5905 160.333 79.2988C160.538 79.0072 160.682 78.7451 160.764 78.5127C160.85 78.2757 160.894 78.0456 160.894 77.8223C160.894 77.5078 160.834 77.2321 160.716 76.9951C160.602 76.7536 160.433 76.5645 160.21 76.4277C159.987 76.2865 159.715 76.2158 159.396 76.2158C159.027 76.2158 158.717 76.2956 158.467 76.4551C158.216 76.6146 158.027 76.8356 157.899 77.1182C157.772 77.3962 157.708 77.7152 157.708 78.0752H156.061C156.061 77.4964 156.193 76.9678 156.457 76.4893C156.721 76.0062 157.104 75.6234 157.605 75.3408C158.107 75.0537 158.711 74.9102 159.417 74.9102C160.082 74.9102 160.647 75.0218 161.112 75.2451C161.577 75.4684 161.93 75.7852 162.172 76.1953C162.418 76.6055 162.541 77.0908 162.541 77.6514C162.541 77.9613 162.491 78.2689 162.391 78.5742C162.29 78.8796 162.147 79.1849 161.96 79.4902C161.778 79.791 161.561 80.0941 161.311 80.3994C161.06 80.7002 160.784 81.0055 160.483 81.3154L158.33 83.6875H162.924ZM171.131 83.6875V85H164.459V83.8721L167.699 80.3379C168.055 79.9368 168.335 79.5905 168.54 79.2988C168.745 79.0072 168.889 78.7451 168.971 78.5127C169.057 78.2757 169.101 78.0456 169.101 77.8223C169.101 77.5078 169.041 77.2321 168.923 76.9951C168.809 76.7536 168.64 76.5645 168.417 76.4277C168.194 76.2865 167.923 76.2158 167.604 76.2158C167.234 76.2158 166.924 76.2956 166.674 76.4551C166.423 76.6146 166.234 76.8356 166.106 77.1182C165.979 77.3962 165.915 77.7152 165.915 78.0752H164.268C164.268 77.4964 164.4 76.9678 164.664 76.4893C164.928 76.0062 165.311 75.6234 165.812 75.3408C166.314 75.0537 166.918 74.9102 167.624 74.9102C168.289 74.9102 168.854 75.0218 169.319 75.2451C169.784 75.4684 170.137 75.7852 170.379 76.1953C170.625 76.6055 170.748 77.0908 170.748 77.6514C170.748 77.9613 170.698 78.2689 170.598 78.5742C170.497 78.8796 170.354 79.1849 170.167 79.4902C169.985 79.791 169.768 80.0941 169.518 80.3994C169.267 80.7002 168.991 81.0055 168.69 81.3154L166.537 83.6875H171.131ZM172.796 76.7354C172.796 76.4027 172.878 76.0973 173.042 75.8193C173.206 75.5413 173.425 75.3203 173.698 75.1562C173.976 74.9876 174.277 74.9033 174.601 74.9033C174.929 74.9033 175.227 74.9876 175.496 75.1562C175.765 75.3203 175.979 75.5413 176.139 75.8193C176.303 76.0973 176.385 76.4027 176.385 76.7354C176.385 77.068 176.303 77.3734 176.139 77.6514C175.979 77.9248 175.765 78.1413 175.496 78.3008C175.227 78.4603 174.929 78.54 174.601 78.54C174.277 78.54 173.976 78.4603 173.698 78.3008C173.425 78.1413 173.206 77.9248 173.042 77.6514C172.878 77.3734 172.796 77.068 172.796 76.7354ZM173.719 76.7354C173.719 76.9814 173.805 77.1888 173.979 77.3574C174.152 77.5215 174.359 77.6035 174.601 77.6035C174.842 77.6035 175.045 77.5215 175.209 77.3574C175.373 77.1934 175.455 76.986 175.455 76.7354C175.455 76.4801 175.373 76.2682 175.209 76.0996C175.045 75.931 174.842 75.8467 174.601 75.8467C174.359 75.8467 174.152 75.931 173.979 76.0996C173.805 76.2682 173.719 76.4801 173.719 76.7354ZM184.414 81.7598H186.123C186.068 82.4115 185.886 82.9925 185.576 83.5029C185.266 84.0088 184.831 84.4076 184.271 84.6992C183.71 84.9909 183.029 85.1367 182.227 85.1367C181.611 85.1367 181.058 85.0273 180.565 84.8086C180.073 84.5853 179.652 84.2708 179.301 83.8652C178.95 83.4551 178.681 82.9606 178.494 82.3818C178.312 81.8031 178.221 81.1559 178.221 80.4404V79.6133C178.221 78.8978 178.314 78.2507 178.501 77.6719C178.692 77.0931 178.966 76.5986 179.321 76.1885C179.677 75.7738 180.103 75.457 180.6 75.2383C181.101 75.0195 181.664 74.9102 182.288 74.9102C183.081 74.9102 183.751 75.056 184.298 75.3477C184.845 75.6393 185.269 76.0426 185.569 76.5576C185.875 77.0726 186.062 77.6628 186.13 78.3281H184.421C184.375 77.8997 184.275 77.5329 184.12 77.2275C183.97 76.9222 183.746 76.6898 183.45 76.5303C183.154 76.3662 182.767 76.2842 182.288 76.2842C181.896 76.2842 181.554 76.3571 181.263 76.5029C180.971 76.6488 180.727 76.863 180.531 77.1455C180.335 77.4281 180.187 77.7767 180.087 78.1914C179.991 78.6016 179.943 79.071 179.943 79.5996V80.4404C179.943 80.9417 179.987 81.3975 180.073 81.8076C180.164 82.2132 180.301 82.5618 180.483 82.8535C180.67 83.1452 180.907 83.3708 181.194 83.5303C181.481 83.6898 181.826 83.7695 182.227 83.7695C182.714 83.7695 183.108 83.6921 183.409 83.5371C183.715 83.3822 183.945 83.1566 184.1 82.8604C184.259 82.5596 184.364 82.1927 184.414 81.7598Z" fill="black" fill-opacity="0.87"/>
</g>
<defs>
<filter id="filter0_d_4988_45056" x="0" y="48" width="212" height="68" 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="2"/>
<feGaussianBlur stdDeviation="3"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.12 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4988_45056"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4988_45056" result="shape"/>
</filter>
<filter id="filter1_b_4988_45056" x="12" y="58" width="188" height="44" 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_4988_45056"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_backgroundBlur_4988_45056" result="shape"/>
</filter>
</defs>
</svg>
", "description": "Displays a single entity attribute or the latest telemetry with optional label and icon.", "descriptor": { "type": "latest", @@ -14,10 +14,12 @@ "controllerScript": "self.onInit = function() {\n self.ctx.$scope.labelValueCardWidget.onInit();\n};\n\nself.onDataUpdated = function() {\n self.ctx.$scope.labelValueCardWidget.onDataUpdated();\n};\n\nself.typeParameters = function() {\n return {\n maxDatasources: 1,\n maxDataKeys: 1,\n singleEntity: true,\n horizontal: true,\n previewWidth: '280px',\n previewHeight: '80px',\n embedTitlePanel: true\n };\n};\n\nself.actionSources = function() {\n return {\n 'cardClick': {\n name: 'widget-action.card-click',\n multiple: false\n }\n };\n}\n\nself.onDestroy = function() {\n};\n", "settingsSchema": "", "dataKeySettingsSchema": "", - "settingsDirective": "", - "hasBasicMode": false, - "basicModeDirective": "", + "settingsDirective": "tb-label-value-card-widget-settings", + "hasBasicMode": true, + "basicModeDirective": "tb-label-value-card-basic-config", "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.2392660816082064,\"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}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgba(0, 0, 0, 0)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{},\"title\":\"Label & value card\",\"dropShadow\":true,\"enableFullscreen\":false,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":\"°C\",\"decimals\":0,\"useDashboardTimewindow\":true,\"widgetStyle\":{},\"actions\":{},\"configMode\":\"basic\",\"displayTimewindow\":true,\"margin\":\"0px\",\"borderRadius\":\"0px\",\"widgetCss\":\"\",\"pageSize\":1024,\"noDataDisplayMessage\":\"\",\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleFont\":{\"size\":12,\"sizeUnit\":\"px\",\"family\":null,\"weight\":null,\"style\":null,\"lineHeight\":\"1.6\"},\"titleIcon\":\"\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"14px\",\"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}}" }, - "tags": null + "tags": [ + "label" + ] } \ No newline at end of file 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 1a705c3c6f..ac8cb25d60 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 @@ -136,6 +136,9 @@ import { MobileAppQrCodeBasicConfigComponent } from '@home/components/widget/con import { LabelCardBasicConfigComponent } from '@home/components/widget/config/basic/cards/label-card-basic-config.component'; +import { + LabelValueCardBasicConfigComponent +} from '@home/components/widget/config/basic/cards/label-value-card-basic-config.component'; @NgModule({ declarations: [ @@ -181,7 +184,8 @@ import { RadarChartBasicConfigComponent, DigitalSimpleGaugeBasicConfigComponent, MobileAppQrCodeBasicConfigComponent, - LabelCardBasicConfigComponent + LabelCardBasicConfigComponent, + LabelValueCardBasicConfigComponent ], imports: [ CommonModule, @@ -229,7 +233,8 @@ import { RadarChartBasicConfigComponent, DigitalSimpleGaugeBasicConfigComponent, MobileAppQrCodeBasicConfigComponent, - LabelCardBasicConfigComponent + LabelCardBasicConfigComponent, + LabelValueCardBasicConfigComponent ] }) export class BasicWidgetConfigModule { @@ -271,5 +276,6 @@ export const basicWidgetConfigComponentsMap: {[key: string]: Type + + + + + +
+
widget-config.appearance
+
+ + {{ 'widgets.label-card.auto-scale' | translate }} + +
+
+ + {{ 'widgets.label-card.label' | translate }} + +
+ + + + + + + +
+
+
+ + {{ 'widgets.label-card.icon' | translate }} + +
+ + + + + + + + +
+
+
+
widgets.label-value-card.value
+
+ + + +
widget-config.decimals-suffix
+ + + + + +
+
+
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+
widget-config.show-card-buttons
+ + {{ 'fullscreen.fullscreen' | translate }} + +
+
+
{{ 'widget-config.card-border-radius' | translate }}
+ + + +
+
+
{{ 'widget-config.card-padding' | translate }}
+ + + +
+
+ + + diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/label-value-card-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/label-value-card-basic-config.component.ts new file mode 100644 index 0000000000..5add2284ab --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/label-value-card-basic-config.component.ts @@ -0,0 +1,191 @@ +/// +/// 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 { + DataKey, + datasourcesHasAggregation, + datasourcesHasOnlyComparisonAggregation, + WidgetConfig, +} from '@shared/models/widget.models'; +import { WidgetConfigComponent } from '@home/components/widget/widget-config.component'; +import { formatValue, isUndefined } from '@core/utils'; +import { + labelValueCardWidgetDefaultSettings, + LabelValueCardWidgetSettings +} from '@home/components/widget/lib/cards/label-value-card-widget.models'; +import { DataKeyType } from '@shared/models/telemetry/telemetry.models'; +import { + getTimewindowConfig, + setTimewindowConfig +} from '@home/components/widget/config/timewindow-config-panel.component'; + +@Component({ + selector: 'tb-label-value-card-basic-config', + templateUrl: './label-value-card-basic-config.component.html', + styleUrls: ['../basic-config.scss'] +}) +export class LabelValueCardBasicConfigComponent extends BasicWidgetConfigComponent { + + public get displayTimewindowConfig(): boolean { + const datasources = this.labelValueCardWidgetConfigForm.get('datasources').value; + return datasourcesHasAggregation(datasources); + } + + public onlyHistoryTimewindow(): boolean { + const datasources = this.labelValueCardWidgetConfigForm.get('datasources').value; + return datasourcesHasOnlyComparisonAggregation(datasources); + } + + labelValueCardWidgetConfigForm: UntypedFormGroup; + + valuePreviewFn = this._valuePreviewFn.bind(this); + + constructor(protected store: Store, + protected widgetConfigComponent: WidgetConfigComponent, + private fb: UntypedFormBuilder) { + super(store, widgetConfigComponent); + } + + protected configForm(): UntypedFormGroup { + return this.labelValueCardWidgetConfigForm; + } + + protected defaultDataKeys(configData: WidgetConfigComponentData): DataKey[] { + return [{ name: 'temperature', label: 'Temperature', type: DataKeyType.timeseries }]; + } + + protected onConfigSet(configData: WidgetConfigComponentData) { + const settings: LabelValueCardWidgetSettings = {...labelValueCardWidgetDefaultSettings, ...(configData.config.settings || {})}; + this.labelValueCardWidgetConfigForm = this.fb.group({ + timewindowConfig: [getTimewindowConfig(configData.config), []], + datasources: [configData.config.datasources, []], + autoScale: [settings.autoScale, []], + + showLabel: [settings.showLabel, []], + label: [settings.label, []], + labelFont: [settings.labelFont, []], + labelColor: [settings.labelColor, []], + + showIcon: [settings.showIcon, []], + iconSize: [settings.iconSize, [Validators.min(0)]], + iconSizeUnit: [settings.iconSizeUnit, []], + icon: [settings.icon, []], + iconColor: [settings.iconColor, []], + + units: [configData.config.units, []], + decimals: [configData.config.decimals, []], + valueFont: [settings.valueFont, []], + valueColor: [settings.valueColor, []], + + background: [settings.background, []], + + cardButtons: [this.getCardButtons(configData.config), []], + borderRadius: [configData.config.borderRadius, []], + padding: [settings.padding, []], + + actions: [configData.config.actions || {}, []] + }); + } + + protected prepareOutputConfig(config: any): WidgetConfigComponentData { + setTimewindowConfig(this.widgetConfig.config, config.timewindowConfig); + this.widgetConfig.config.datasources = config.datasources; + + this.widgetConfig.config.settings = this.widgetConfig.config.settings || {}; + + this.widgetConfig.config.settings.autoScale = config.autoScale; + + this.widgetConfig.config.settings.showLabel = config.showLabel; + this.widgetConfig.config.settings.label = config.label; + this.widgetConfig.config.settings.labelFont = config.labelFont; + this.widgetConfig.config.settings.labelColor = config.labelColor; + + this.widgetConfig.config.settings.showIcon = config.showIcon; + this.widgetConfig.config.settings.iconSize = config.iconSize; + this.widgetConfig.config.settings.iconSizeUnit = config.iconSizeUnit; + this.widgetConfig.config.settings.icon = config.icon; + this.widgetConfig.config.settings.iconColor = config.iconColor; + + this.widgetConfig.config.units = config.units; + this.widgetConfig.config.decimals = config.decimals; + this.widgetConfig.config.settings.valueFont = config.valueFont; + this.widgetConfig.config.settings.valueColor = config.valueColor; + + this.widgetConfig.config.settings.background = config.background; + + this.setCardButtons(config.cardButtons, this.widgetConfig.config); + this.widgetConfig.config.borderRadius = config.borderRadius; + this.widgetConfig.config.settings.padding = config.padding; + + this.widgetConfig.config.actions = config.actions; + return this.widgetConfig; + } + + protected validatorTriggers(): string[] { + return ['showLabel', 'showIcon']; + } + + protected updateValidators(emitEvent: boolean, trigger?: string) { + const showLabel: boolean = this.labelValueCardWidgetConfigForm.get('showLabel').value; + const showIcon: boolean = this.labelValueCardWidgetConfigForm.get('showIcon').value; + + if (showLabel) { + this.labelValueCardWidgetConfigForm.get('label').enable(); + this.labelValueCardWidgetConfigForm.get('labelFont').enable(); + this.labelValueCardWidgetConfigForm.get('labelColor').enable(); + } else { + this.labelValueCardWidgetConfigForm.get('label').disable(); + this.labelValueCardWidgetConfigForm.get('labelFont').disable(); + this.labelValueCardWidgetConfigForm.get('labelColor').disable(); + } + + if (showIcon) { + this.labelValueCardWidgetConfigForm.get('iconSize').enable(); + this.labelValueCardWidgetConfigForm.get('iconSizeUnit').enable(); + this.labelValueCardWidgetConfigForm.get('icon').enable(); + this.labelValueCardWidgetConfigForm.get('iconColor').enable(); + } else { + this.labelValueCardWidgetConfigForm.get('iconSize').disable(); + this.labelValueCardWidgetConfigForm.get('iconSizeUnit').disable(); + this.labelValueCardWidgetConfigForm.get('icon').disable(); + this.labelValueCardWidgetConfigForm.get('iconColor').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.labelValueCardWidgetConfigForm.get('units').value; + const decimals: number = this.labelValueCardWidgetConfigForm.get('decimals').value; + return formatValue(22, decimals, units, true); + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/cards/label-value-card-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/cards/label-value-card-widget.component.ts index c4aecd7943..9a47a5db9d 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/label-value-card-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/label-value-card-widget.component.ts @@ -165,10 +165,8 @@ export class LabelValueCardWidgetComponent implements OnInit, AfterViewInit, OnD public onDataUpdated() { const tsValue = getSingleTsValue(this.ctx.data); - let ts; let value; if (tsValue && isDefinedAndNotNull(tsValue[1]) && tsValue[0] !== 0) { - ts = tsValue[0]; value = tsValue[1]; this.valueText = formatValue(value, this.decimals, this.units, false); } else { diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-card-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-card-widget-settings.component.ts index b3ebca2ae8..166170c8ee 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-card-widget-settings.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-card-widget-settings.component.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { Component, Injector } from '@angular/core'; +import { Component } from '@angular/core'; import { WidgetSettings, WidgetSettingsComponent } from '@shared/models/widget.models'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { Store } from '@ngrx/store'; @@ -31,7 +31,6 @@ export class LabelCardWidgetSettingsComponent extends WidgetSettingsComponent { labelCardWidgetSettingsForm: UntypedFormGroup; constructor(protected store: Store, - private $injector: Injector, private fb: UntypedFormBuilder) { super(store); } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.html new file mode 100644 index 0000000000..b10d497f6c --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.html @@ -0,0 +1,81 @@ + + +
+
widgets.label-value-card.label-value-card-style
+
+ + {{ 'widgets.label-card.auto-scale' | translate }} + +
+
+ + {{ 'widgets.label-card.label' | translate }} + +
+ + + + + + + +
+
+
+ + {{ 'widgets.label-card.icon' | translate }} + +
+ + + + + + + + +
+
+
+
widgets.label-value-card.value
+
+ + + + +
+
+
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+
{{ 'widget-config.card-padding' | translate }}
+ + + +
+
+ diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.ts new file mode 100644 index 0000000000..b8c80ba0de --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.ts @@ -0,0 +1,108 @@ +/// +/// 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 { WidgetSettings, WidgetSettingsComponent } from '@shared/models/widget.models'; +import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { labelValueCardWidgetDefaultSettings } from '@home/components/widget/lib/cards/label-value-card-widget.models'; +import { formatValue } from '@core/utils'; + +@Component({ + selector: 'tb-label-value-card-widget-settings', + templateUrl: './label-value-card-widget-settings.component.html', + styleUrls: [] +}) +export class LabelValueCardWidgetSettingsComponent extends WidgetSettingsComponent { + + labelValueCardWidgetSettingsForm: UntypedFormGroup; + + valuePreviewFn = this._valuePreviewFn.bind(this); + + constructor(protected store: Store, + private fb: UntypedFormBuilder) { + super(store); + } + + protected settingsForm(): UntypedFormGroup { + return this.labelValueCardWidgetSettingsForm; + } + + protected defaultSettings(): WidgetSettings { + return {...labelValueCardWidgetDefaultSettings}; + } + + protected onSettingsSet(settings: WidgetSettings) { + this.labelValueCardWidgetSettingsForm = this.fb.group({ + autoScale: [settings.autoScale, []], + + showLabel: [settings.showLabel, []], + label: [settings.label, []], + labelFont: [settings.labelFont, []], + labelColor: [settings.labelColor, []], + + showIcon: [settings.showIcon, []], + iconSize: [settings.iconSize, [Validators.min(0)]], + iconSizeUnit: [settings.iconSizeUnit, []], + icon: [settings.icon, []], + iconColor: [settings.iconColor, []], + + valueFont: [settings.valueFont, []], + valueColor: [settings.valueColor, []], + + background: [settings.background, []], + padding: [settings.padding, []] + }); + } + + protected validatorTriggers(): string[] { + return ['showLabel', 'showIcon']; + } + + protected updateValidators(emitEvent: boolean) { + const showLabel: boolean = this.labelValueCardWidgetSettingsForm.get('showLabel').value; + const showIcon: boolean = this.labelValueCardWidgetSettingsForm.get('showIcon').value; + + if (showLabel) { + this.labelValueCardWidgetSettingsForm.get('label').enable(); + this.labelValueCardWidgetSettingsForm.get('labelFont').enable(); + this.labelValueCardWidgetSettingsForm.get('labelColor').enable(); + } else { + this.labelValueCardWidgetSettingsForm.get('label').disable(); + this.labelValueCardWidgetSettingsForm.get('labelFont').disable(); + this.labelValueCardWidgetSettingsForm.get('labelColor').disable(); + } + + if (showIcon) { + this.labelValueCardWidgetSettingsForm.get('iconSize').enable(); + this.labelValueCardWidgetSettingsForm.get('iconSizeUnit').enable(); + this.labelValueCardWidgetSettingsForm.get('icon').enable(); + this.labelValueCardWidgetSettingsForm.get('iconColor').enable(); + } else { + this.labelValueCardWidgetSettingsForm.get('iconSize').disable(); + this.labelValueCardWidgetSettingsForm.get('iconSizeUnit').disable(); + this.labelValueCardWidgetSettingsForm.get('icon').disable(); + this.labelValueCardWidgetSettingsForm.get('iconColor').disable(); + } + } + + private _valuePreviewFn(): string { + const units: string = this.widgetConfig.config.units; + const decimals: number = this.widgetConfig.config.decimals; + return formatValue(22, decimals, units, true); + } +} 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 47db116fbd..e4df67e2f8 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 @@ -359,6 +359,9 @@ import { import { LabelCardWidgetSettingsComponent } from '@home/components/widget/lib/settings/cards/label-card-widget-settings.component'; +import { + LabelValueCardWidgetSettingsComponent +} from '@home/components/widget/lib/settings/cards/label-value-card-widget-settings.component'; @NgModule({ declarations: [ @@ -486,7 +489,8 @@ import { BarChartWidgetSettingsComponent, PolarAreaChartWidgetSettingsComponent, RadarChartWidgetSettingsComponent, - LabelCardWidgetSettingsComponent + LabelCardWidgetSettingsComponent, + LabelValueCardWidgetSettingsComponent ], imports: [ CommonModule, @@ -619,7 +623,8 @@ import { BarChartWidgetSettingsComponent, PolarAreaChartWidgetSettingsComponent, RadarChartWidgetSettingsComponent, - LabelCardWidgetSettingsComponent + LabelCardWidgetSettingsComponent, + LabelValueCardWidgetSettingsComponent ] }) export class WidgetSettingsModule { @@ -719,5 +724,6 @@ export const widgetSettingsComponentsMap: {[key: string]: Type