feature/IVYPORTAL-17541-Custom-fields-are-missing-in-Excel-file-in-Ca…

…se-Widget-LE (#1015)
axonivy-market · Sep 10, 2024 · 691b26f · 691b26f
1 parent 3807e7f
commit 691b26f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/CaseDashboardExporter.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/CaseDashboardExporter.java
@@ -55,14 +55,14 @@ public String getColumnName(String column) {
 
   /**
    * Get header text from the custom column
-   * Custom column format: fieldType__fieldName__header
+   * Custom column format: fieldFormat__fieldName__header__fieldType
    * 
    * @param column
    * @return header text
    */
   private String getCustomColumnName(String column) {
     String[] columnParts = getCustomColumnParts(column);
-    if (columnParts.length != 3) {
+    if (columnParts.length != 4) {
       return "";
     }
     return columnParts[2];
@@ -97,15 +97,15 @@ private Object getCommonColumnValue(DashboardStandardCaseColumn sortField, ICase
 
   /**
    * Get custom column value
-   * Custom column format: fieldType__fieldName__header
+   * Custom column format: fieldFormat__fieldName__header__fieldType
    * 
    * @param column
    * @param caseItem
    * @return case column value
    */
   private Object getCustomColumnValue(String column, ICase caseItem) {
     String[] columnParts = getCustomColumnParts(column);
-    if (columnParts.length != 3) {
+    if (columnParts.length != 4) {
       return "";
     }
 

diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/TaskDashboardExporter.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/exporter/TaskDashboardExporter.java
@@ -56,7 +56,7 @@ public String getColumnName(String column) {
 
   /**
    * Get header text from the custom column
-   * Custom column format: fieldType__fieldName__header
+   * Custom column format: fieldFormat__fieldName__header__fieldType
    * 
    * @param column
    * @return customColumnName