From c9e0770a14d1e91f5cf0df65787786400dfb5568 Mon Sep 17 00:00:00 2001 From: mravula Date: Tue, 15 Dec 2020 16:00:49 -0500 Subject: Raptor Crosstab report UI Changes Issue-ID: PORTAL-902 Change-Id: I02f1e5651251a8c26d6c524d659617e5941343a2 Signed-off-by: mravula (cherry picked from commit efb31c8139526215182dda47b949ddc11dfca534) --- .../model/definition/DrillDownParamDef.java | 20 ++++++++++++++ .../model/definition/ReportDefinition.java | 17 ++++++++++-- .../model/definition/wizard/ColumnEditJSON.java | 8 +++++- .../model/definition/wizard/ColumnJSON.java | 15 ++++++++++ .../model/definition/wizard/DefinitionJSON.java | 20 ++++++++++++++ .../model/definition/wizard/FormEditJSON.java | 32 +++++++++++++++++++++- .../model/definition/wizard/SearchFieldJSON.java | 8 ++++++ 7 files changed, 115 insertions(+), 5 deletions(-) (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition') diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/DrillDownParamDef.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/DrillDownParamDef.java index 97a87abb..fc2184fc 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/DrillDownParamDef.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/DrillDownParamDef.java @@ -106,4 +106,24 @@ public class DrillDownParamDef extends RaptorObject { return valFieldId; } + private void setFieldName(String fieldName) { + this.fieldName = fieldName; + } + + private void setValType(String valType) { + this.valType = valType; + } + + private void setValValue(String valValue) { + this.valValue = valValue; + } + + private void setValColId(String valColId) { + this.valColId = valColId; + } + + private void setValFieldId(String valFieldId) { + this.valFieldId = valFieldId; + } + } // DrillDownParamDef diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java index 343862b6..962cb032 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java @@ -39,6 +39,7 @@ package org.onap.portalsdk.analytics.model.definition; import java.io.Serializable; import java.sql.Connection; +import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; import java.util.Iterator; @@ -47,6 +48,7 @@ import java.util.StringTokenizer; import java.util.Vector; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.xml.bind.JAXBException; @@ -258,6 +260,7 @@ public class ReportDefinition extends ReportWrapper implements Serializable { boolean valColExist = false; if (!getDataSourceList().getDataSource().isEmpty()) { + if (getAllColumns().stream().anyMatch(dto -> dto.getCrossTabValue() != null)) { for (Iterator iter = getAllColumns().iterator(); iter.hasNext();) { DataColumnType dct = (DataColumnType) iter.next(); @@ -268,13 +271,15 @@ public class ReportDefinition extends ReportWrapper implements Serializable { if (nvl(dct.getCrossTabValue()).equals(AppConstants.CV_VALUE)) valColExist = true; } // for + } else { + return true; + } } // if return rowColExist && colColExist && valColExist; } // canPersistCrossTabReport private boolean canPersistReport() { - String reportType = getReportType(); return getReportType().equals(AppConstants.RT_CROSSTAB) ? canPersistCrossTabReport() : (getReportType().equals(AppConstants.RT_LINEAR)? canPersistLinearReport() :(getReportType().equals(AppConstants.RT_HIVE)? canPersistLinearReport() @@ -943,8 +948,14 @@ public class ReportDefinition extends ReportWrapper implements Serializable { fft.setValidationType(validationType); fft.setMandatory(nvl(mandatory, "N")); fft.setDefaultValue(nvl(defaultValue)); - fft.setOrderBySeq((getFormFieldList() == null) ? 1 : getFormFieldList().getFormField() - .size() + 1); + List orderSeq = new ArrayList<>(); + if(getFormFieldList() != null) + orderSeq = getFormFieldList().getFormField().stream().map(FormFieldType::getOrderBySeq).collect(Collectors.toList()); + Integer max=0; + if(orderSeq.size()>0) { + max = Collections.max(orderSeq); + } + fft.setOrderBySeq((getFormFieldList() == null) ? 1 : max+1); fft.setFieldSQL(fieldSQL); try { fft.setRangeStartDate(DatatypeFactory.newInstance() diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/ColumnEditJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/ColumnEditJSON.java index af7e6e8c..0908eb4a 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/ColumnEditJSON.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/ColumnEditJSON.java @@ -73,8 +73,14 @@ public class ColumnEditJSON implements WizardJSON { private String displayTotal; private SemaphoreList semaphoreList; private String semaphoreId; + private String crossTabValue; - + public String getCrossTabValue() { + return crossTabValue; + } + public void setCrossTabValue(String crossTabValue) { + this.crossTabValue = crossTabValue; + } public SemaphoreList getSemaphoreList() { return semaphoreList; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/ColumnJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/ColumnJSON.java index 95cc13c3..14f765f7 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/ColumnJSON.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/ColumnJSON.java @@ -41,6 +41,9 @@ public class ColumnJSON implements ElementJSON { private String id; private String name; + private String crossTabValue; + private String repType; + public String getId() { return id; } @@ -53,6 +56,18 @@ public class ColumnJSON implements ElementJSON { public void setName(String name) { this.name = name; } + public String getCrossTabValue() { + return crossTabValue; + } + public void setCrossTabValue(String crossTabValue) { + this.crossTabValue = crossTabValue; + } + public String getRepType() { + return repType; + } + public void setRepType(String repType) { + this.repType = repType; + } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java index 888cf1e0..780136f3 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java @@ -81,6 +81,26 @@ public class DefinitionJSON implements WizardJSON { private String dashboardLayoutJSON; private DashboardReports dashboardReports; private String chartType; + private String reportHeader; + private String reportFooter; + + + + public String getReportHeader() { + return reportHeader; + } + + public void setReportHeader(String reportHeader) { + this.reportHeader = reportHeader; + } + + public String getReportFooter() { + return reportFooter; + } + + public void setReportFooter(String reportFooter) { + this.reportFooter = reportFooter; + } @Override public String getTabName() { diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/FormEditJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/FormEditJSON.java index b7ddc3b8..8c45612e 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/FormEditJSON.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/FormEditJSON.java @@ -37,8 +37,11 @@ */ package org.onap.portalsdk.analytics.model.definition.wizard; +import java.util.Calendar; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + public class FormEditJSON implements WizardJSON { private String tabId; @@ -60,7 +63,35 @@ public class FormEditJSON implements WizardJSON { private String errorMessage; private String errorStackTrace; private Integer orderSeq; + private String rangeStartDateSQL = null; + private String rangeEndDateSQL = null; + private String rangeStartDate = null; + private String rangeEndDate = null; + public String getRangeStartDate() { + return rangeStartDate; + } + public void setRangeStartDate(String rangeStartDate) { + this.rangeStartDate = rangeStartDate; + } + public String getRangeEndDate() { + return rangeEndDate; + } + public void setRangeEndDate(String rangeEndDate) { + this.rangeEndDate = rangeEndDate; + } + public String getRangeStartDateSQL() { + return rangeStartDateSQL; + } + public void setRangeStartDateSQL(String rangeStartDateSQL) { + this.rangeStartDateSQL = rangeStartDateSQL; + } + public String getRangeEndDateSQL() { + return rangeEndDateSQL; + } + public void setRangeEndDateSQL(String rangeEndDateSQL) { + this.rangeEndDateSQL = rangeEndDateSQL; + } public String getMessage() { return message; } @@ -161,7 +192,6 @@ public class FormEditJSON implements WizardJSON { this.orderSeq = orderSeq; } - public String getLastUpdatedFieldId() { return lastUpdatedFieldId; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/SearchFieldJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/SearchFieldJSON.java index f80ba993..f2596627 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/SearchFieldJSON.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/SearchFieldJSON.java @@ -42,6 +42,8 @@ public class SearchFieldJSON implements ElementJSON { private String id; private String name; private Integer orderSeq; + private String validationType; + public String getId() { return id; } @@ -60,6 +62,12 @@ public class SearchFieldJSON implements ElementJSON { public void setOrderSeq(Integer orderSeq) { this.orderSeq = orderSeq; } + public String getValidationType() { + return validationType; + } + public void setValidationType(String validationType) { + this.validationType = validationType; + } -- cgit 1.2.3-korg