IVYPORTAL-17527 Improve visualization of numbers - Add delimiter for …

…big numbers (PR #1251)
axonivy-market · Nov 25, 2024 · 6f7df46 · 6f7df46
1 parent bc60a0c
commit 6f7df46
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 14 deletions.
diff --git a/...src_hd/ch/ivy/addon/portal/generic/dashboard/component/CaseDashboardWidget/CaseInfo.xhtml b/...src_hd/ch/ivy/addon/portal/generic/dashboard/component/CaseDashboardWidget/CaseInfo.xhtml
@@ -20,9 +20,16 @@
           alwaysShowState="true" responsiveStyleClass="" />
       </div>
       <h:panelGroup styleClass="ui-g-4 text-right" id="case-by-state" layout="block">
-        <h:outputText styleClass="case-by-state" value="#{entry.value}"></h:outputText>
+        <h:outputText styleClass="case-by-state" value="#{entry.value}">
+          <f:convertNumber locale="#{localeBean.locale}" />
+        </h:outputText>
       </h:panelGroup>
-      <p:tooltip for="case-by-state" value="#{entry.value} #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/caseWidgetInfo/numberOfCase')}" trackMouse="true" />
+      <p:tooltip for="case-by-state" trackMouse="true">
+        <h:outputText value="#{entry.value}">
+          <f:convertNumber locale="#{localeBean.locale}" />
+        </h:outputText>
+        <h:outputText value=" #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/caseWidgetInfo/numberOfCase')}" />
+      </p:tooltip>
     </ui:repeat>
   </h:panelGroup>
 </p:tab>
@@ -46,9 +53,16 @@
         <p:tooltip for="category" value="#{empty entry.categoryDisplayPath ? ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/noCategory') : entry.categoryDisplayPath}"
           trackMouse="true" />
         <h:panelGroup styleClass="ui-g-4 text-right" id="case-summary" layout="block">
-          <h:outputText styleClass="case-summary" value="#{entry.summary}"></h:outputText>
+          <h:outputText styleClass="case-summary" value="#{entry.summary}">
+            <f:convertNumber locale="#{localeBean.locale}" />
+          </h:outputText>
         </h:panelGroup>
-        <p:tooltip for="case-summary" value="#{entry.summary} #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/caseWidgetInfo/numberOfCase')}" trackMouse="true" />
+        <p:tooltip for="case-summary" trackMouse="true">
+          <h:outputText value="#{entry.summary}">
+            <f:convertNumber locale="#{localeBean.locale}" />
+          </h:outputText>
+          <h:outputText value=" #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/caseWidgetInfo/numberOfCase')}"/>
+        </p:tooltip>
       </ui:repeat>
     </div>
     <div class="ui-g" jsf:rendered="#{empty widget.caseByCategoryStatistic}">

diff --git a/.../ch/ivy/addon/portal/generic/dashboard/component/ProcessDashboardWidget/ProcessInfo.xhtml b/.../ch/ivy/addon/portal/generic/dashboard/component/ProcessDashboardWidget/ProcessInfo.xhtml
@@ -20,8 +20,18 @@
             styleClass="dashboard-processes__type-text--#{entry.key.name().toLowerCase()} dashboard-processes__type-text" />
         </div>
         <div class="ui-g-4">
-          <h:outputText rendered="#{entry.value gt 1}">#{entry.value} #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/processes')}</h:outputText>
-          <h:outputText rendered="#{entry.value le 1}">#{entry.value} #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/process')}</h:outputText>
+          <h:panelGroup rendered="#{entry.value gt 1}">
+            <h:outputText value="#{entry.value}">
+              <f:convertNumber locale="#{localeBean.locale}" />
+            </h:outputText>
+            <h:outputText value=" #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/processes')}" />
+          </h:panelGroup>
+          <h:panelGroup rendered="#{entry.value le 1}">
+            <h:outputText value="#{entry.value}">
+              <f:convertNumber locale="#{localeBean.locale}" />
+            </h:outputText>
+            <h:outputText value=" #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/process')}" />
+          </h:panelGroup>
         </div>
       </ui:repeat>
     </div>

diff --git a/...src_hd/ch/ivy/addon/portal/generic/dashboard/component/TaskDashboardWidget/TaskInfo.xhtml b/...src_hd/ch/ivy/addon/portal/generic/dashboard/component/TaskDashboardWidget/TaskInfo.xhtml
@@ -18,15 +18,30 @@
       <h:outputText value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/tasWidgetkInfo/expireToday')}" />
     </div>
     <h:panelGroup styleClass="ui-g-4 text-right" id="expire-today" layout="block">
-      <h:outputText styleClass="expire-today" value="#{widget.numberOfTasksExpireToday}"></h:outputText>
+      <h:outputText styleClass="expire-today" value="#{widget.numberOfTasksExpireToday}">
+        <f:convertNumber locale="#{localeBean.locale}" />
+      </h:outputText>
     </h:panelGroup>
-    <p:tooltip for="expire-today" value="#{widget.numberOfTasksExpireToday} #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/tasWidgetkInfo/numberOfTasks')}" trackMouse="true" />    <div class="ui-g-8">
+    <p:tooltip for="expire-today" trackMouse="true">
+      <h:outputText value="#{widget.numberOfTasksExpireToday}">
+        <f:convertNumber locale="#{localeBean.locale}" />
+      </h:outputText>
+      <h:outputText value=" #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/tasWidgetkInfo/numberOfTasks')}" />
+    </p:tooltip>
+    <div class="ui-g-8">
       <h:outputText value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/tasWidgetkInfo/expiryThisWeek')}" />
     </div>
     <h:panelGroup styleClass="ui-g-4 text-right" id="expire-this-week" layout="block">
-      <h:outputText styleClass="expire-this-week" value="#{widget.numberOfTasksExpireThisWeek}"></h:outputText>
+      <h:outputText styleClass="expire-this-week" value="#{widget.numberOfTasksExpireThisWeek}">
+        <f:convertNumber locale="#{localeBean.locale}" />
+      </h:outputText>
     </h:panelGroup>
-    <p:tooltip for="expire-this-week" value="#{widget.numberOfTasksExpireThisWeek} #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/tasWidgetkInfo/numberOfTasks')}" trackMouse="true" />
+    <p:tooltip for="expire-this-week" trackMouse="true">
+      <h:outputText value="#{widget.numberOfTasksExpireThisWeek}">
+        <f:convertNumber locale="#{localeBean.locale}" />
+      </h:outputText>
+      <h:outputText value=" #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/tasWidgetkInfo/numberOfTasks')}"/>
+    </p:tooltip>
   </h:panelGroup>
 </p:tab>
 
@@ -47,9 +62,16 @@
           alwaysShowState="true" responsiveStyleClass="" />
       </div>
       <h:panelGroup styleClass="ui-g-4 text-right" id="tasks-by-state" layout="block">
-        <h:outputText styleClass="tasks-by-state" value="#{entry.value}"></h:outputText>
+        <h:outputText styleClass="tasks-by-state" value="#{entry.value}">
+          <f:convertNumber locale="#{localeBean.locale}" />
+        </h:outputText>
       </h:panelGroup>
-      <p:tooltip for="tasks-by-state" value="#{entry.value} #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/tasWidgetkInfo/numberOfTasks')}" trackMouse="true" />
+      <p:tooltip for="tasks-by-state" value="#{entry.value} #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/tasWidgetkInfo/numberOfTasks')}" trackMouse="true">
+        <h:outputText value="#{entry.value}">
+          <f:convertNumber locale="#{localeBean.locale}" />
+        </h:outputText>
+        <h:outputText value=" #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/tasWidgetkInfo/numberOfTasks')}"/>
+      </p:tooltip>
     </ui:repeat>
   </h:panelGroup>
 </p:tab>
@@ -73,9 +95,16 @@
         <p:tooltip for="category" value="#{empty entry.categoryDisplayPath ? ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/noCategory') : entry.categoryDisplayPath}"
           trackMouse="true" />
         <h:panelGroup styleClass="ui-g-4 text-right" id="task-summary" layout="block">
-          <h:outputText styleClass="task-summary" value="#{entry.summary}"></h:outputText>
+          <h:outputText styleClass="task-summary" value="#{entry.summary}">
+            <f:convertNumber locale="#{localeBean.locale}" />
+          </h:outputText>
         </h:panelGroup>
-        <p:tooltip for="task-summary" value="#{entry.summary} #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/tasWidgetkInfo/numberOfTasks')}" trackMouse="true" />
+        <p:tooltip for="task-summary" trackMouse="true">
+          <h:outputText value="#{entry.summary}">
+            <f:convertNumber locale="#{localeBean.locale}" />
+          </h:outputText>
+          <h:outputText value=" #{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/tasWidgetkInfo/numberOfTasks')}" />
+        </p:tooltip>
       </ui:repeat>
     </div>
     <div class="ui-g" jsf:rendered="#{empty widget.taskByCategoryStatistic}">