Advanced Search Plugin Tests, DateTime bug fix

Author: Atlas139mkm

CoreFindView/src/au/gov/asd/tac/constellation/views/find2/components/AdvancedFindTab.java

@@ -107,7 +107,7 @@ public AdvancedFindTab(final FindViewTabs parentComponent) {
             changeDisplayedList(newElement);
         });
 
-        currentSelectionChoiceBox.getSelectionModel().selectedItemProperty().addListener(action -> updateSelectionFactors());
+        currentSelectionChoiceBox.getSelectionModel().selectedItemProperty().addListener((final ObservableValue<? extends String> observableValue, final String oldElement, final String newElement) -> updateSelectionFactors());
 
         findAllButton.setOnAction(action -> findAllAction());
         findNextButton.setOnAction(action -> findNextAction());

CoreFindView/src/au/gov/asd/tac/constellation/views/find2/components/advanced/DateTimeCriteriaPanel.java

@@ -30,6 +30,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.Button;
 import javafx.scene.control.OverrunStyle;
+import javafx.scene.control.Tooltip;
 import javafx.scene.text.TextAlignment;
 import org.apache.commons.lang3.StringUtils;
 
@@ -64,6 +65,9 @@ public DateTimeCriteriaPanel(final AdvancedFindTab parentComponent, final String
         dateTimeSelector = new DateTimeSelector(this, dateString, timeString, timeZoneString);
         dateTimeSelectorTwo = new DateTimeSelector(this, dateStringTwo, timeStringTwo, timeZoneStringTwo);
 
+        datePickerButton.setTooltip(new Tooltip(datePickerButton.getText()));
+        datePickerTwoButton.setTooltip(new Tooltip(datePickerTwoButton.getText()));
+
         // On button click display dateTimePicker
         datePickerButton.setOnAction(action -> {
             displayDateTimePicker(dateTimeSelector);
@@ -155,6 +159,9 @@ private void getDateTimeData() {
 
         datePickerButton.setText(dateString + " " + timeString + " " + timeZoneString);
         dateTimeStringPrimary = dateString + " " + timeString + " " + timeZoneString;
+
+        datePickerButton.setTooltip(new Tooltip(datePickerButton.getText()));
+        datePickerTwoButton.setTooltip(new Tooltip(datePickerTwoButton.getText()));
     }
 
     /**
@@ -169,6 +176,9 @@ private void getDateTimeDataTwo() {
 
         datePickerTwoButton.setText(dateStringTwo + " " + timeStringTwo + " " + timeZoneStringTwo);
         dateTimeStringSecondary = dateStringTwo + " " + timeStringTwo + " " + timeZoneStringTwo;
+
+        datePickerButton.setTooltip(new Tooltip(datePickerButton.getText()));
+        datePickerTwoButton.setTooltip(new Tooltip(datePickerTwoButton.getText()));
     }
 
     /**
@@ -209,12 +219,12 @@ private void timeFrameSelectionAction(final String choiceSelection) {
             // set dateTime two data to the current date, max time of today
             // and the previously selected timeZone
             dateStringTwo = LocalDate.now().toString();
-            timeStringTwo = "23:59:59";
+            timeStringTwo = "23:59:59.999";
             timeZoneStringTwo = (StringUtils.isEmpty(timeZoneString) ? TimeZoneUtilities.getTimeZoneAsString(TimeZoneUtilities.UTC) : TimeZoneUtilities.getTimeZoneAsString(ZoneId.of(formattedTimeZoneString)));
 
             // set dateTime one data to the min time of today
             // and the previously selected timeZone
-            timeString = "00:00:00";
+            timeString = "00:00:00.000";
             timeZoneString = (StringUtils.isEmpty(timeZoneString) ? TimeZoneUtilities.getTimeZoneAsString(TimeZoneUtilities.UTC) : TimeZoneUtilities.getTimeZoneAsString(ZoneId.of(formattedTimeZoneString)));
 
             // The Local Date value of the current date based of the timeZone

CoreFindView/src/au/gov/asd/tac/constellation/views/find2/components/advanced/utilities/DateTimeSelector.java

@@ -85,6 +85,7 @@ public DateTimeSelector(final DateTimeCriteriaPanel parentComponent, final Strin
         cancelButton.setOnAction(action -> {
             close();
         });
+
     }
 
     /**
@@ -234,8 +235,12 @@ public String saveTime() {
         sb.append(hourSpinner.getValue() < 10 ? "0" + hourSpinner.getValue().toString() : hourSpinner.getValue().toString());
         sb.append(":" + (minSpinner.getValue() < 10 ? "0" + minSpinner.getValue().toString() : minSpinner.getValue().toString()));
         sb.append(":" + (secSpinner.getValue() < 10 ? "0" + secSpinner.getValue().toString() : secSpinner.getValue().toString()));
-        if (milliSpinner.getValue() != 0) {
-            sb.append(":" + (milliSpinner.getValue() < 10 ? "0" + milliSpinner.getValue().toString() : milliSpinner.getValue().toString()));
+        if (milliSpinner.getValue() > 0) {
+            if (milliSpinner.getValue() > 10 && milliSpinner.getValue() < 100){
+                sb.append(".0" + milliSpinner.getValue().toString());
+            }else {
+                sb.append("." + (milliSpinner.getValue() < 10 ? "00" + milliSpinner.getValue().toString() : milliSpinner.getValue().toString()));
+            }
         }
         return sb.toString();
     }

CoreFindView/src/au/gov/asd/tac/constellation/views/find2/plugins/advanced/AdvancedSearchPlugin.java

@@ -620,6 +620,7 @@ private boolean searchAsDateTime(final FindCriteriaValues values, final int attr
             return matches;
         }
         // convert the string date time into a zonedDateTime for comparisons
+
         final String[] splitDateTime = dateTimeValues.getDateTimeStringPrimaryValue().split(" ");
         final String parseFormatedString = splitDateTime[0] + "T" + splitDateTime[1] + splitDateTime[2];
         final ZonedDateTime valueDateTime = ZonedDateTime.parse(parseFormatedString);

CoreFindView/test/unit/src/au/gov/asd/tac/constellation/views/find2/plugins/BasicFindPluginNGTest.java

@@ -376,7 +376,7 @@ private void setupGraph() {
             wg.setBooleanValue(selectedV, vxId2, false);
             wg.setStringValue(labelV, vxId2, "label name");
             wg.setStringValue(identifierV, vxId2, "identifer name");
-            wg.setIntValue(xV, vxId1, 1);
+            wg.setIntValue(xV, vxId2, 1);
 
             vxId3 = wg.addVertex();
             wg.setBooleanValue(selectedV, vxId3, false);