diff options
| -rw-r--r-- | ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java index 71e6d75c..47af1b71 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/WizardProcessor.java @@ -43,10 +43,12 @@ import java.util.Calendar; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.TimeZone; import javax.servlet.http.HttpServletRequest; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; import org.onap.portalsdk.analytics.error.RaptorException; import org.onap.portalsdk.analytics.error.ValidationException; @@ -105,9 +107,19 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; */ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject { - + public static Calendar getCalendar(XMLGregorianCalendar xmlCalendar){ + // log.debug("Zone ID is " + xmlCalendar.getTimezone()); + TimeZone timeZone = xmlCalendar.getTimeZone(xmlCalendar.getTimezone()); + Calendar calendar = Calendar.getInstance(timeZone); + calendar.set(Calendar.YEAR,xmlCalendar.getYear()); + calendar.set(Calendar.MONTH,xmlCalendar.getMonth()-1); + calendar.set(Calendar.DATE,xmlCalendar.getDay()); + calendar.set(Calendar.HOUR_OF_DAY,xmlCalendar.getHour()); + calendar.set(Calendar.MINUTE,xmlCalendar.getMinute()); + calendar.set(Calendar.SECOND,xmlCalendar.getSecond()); + return calendar; + } private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WizardProcessor.class); - public WizardProcessor() { } @@ -1159,7 +1171,7 @@ public class WizardProcessor extends org.onap.portalsdk.analytics.RaptorObject { && fieldSQL.equals(nvl(currField.getFieldSQL())) && fieldDefaultSQL.equals(nvl(currField.getFieldDefaultSQL())) && dependsOn.equals(nvl(currField.getDependsOn(), "N")) - && (start == null || (start != null && currField.getRangeStartDate() == null) || (start.equals(currField.getRangeStartDate()))) + && (start == null || (start != null && currField.getRangeStartDate() == null) || (start.compareTo(getCalendar(currField.getRangeStartDate())) )==0) && (end == null || (end != null && currField.getRangeEndDate() == null) || (end.equals(currField.getRangeEndDate()))) && rangeStartDateSQL.equals(nvl(currField.getRangeStartDateSQL())) && rangeEndDateSQL.equals(nvl(currField.getRangeEndDateSQL())) |