Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IVYPORTAL-17527 Improve visualization of numbers - Add delimiter for big numbers #1251

Merged
merged 1 commit into from
Nov 25, 2024
Merged

IVYPORTAL-17527 Improve visualization of numbers - Add delimiter for big numbers #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions ...src_hd/ch/ivy/addon/portal/generic/dashboard/component/CaseDashboardWidget/CaseInfo.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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}">
Expand Down
14 changes: 12 additions & 2 deletions .../ch/ivy/addon/portal/generic/dashboard/component/ProcessDashboardWidget/ProcessInfo.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
45 changes: 37 additions & 8 deletions ...src_hd/ch/ivy/addon/portal/generic/dashboard/component/TaskDashboardWidget/TaskInfo.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand All @@ -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}">
Expand Down
Loading