This is the refinement for the search. Moved the next perv buttons to…

… the data banner.
NOAA-PMEL · Jan 31, 2022 · b150933 · b150933
1 parent f314aee
commit b150933
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/gwtui/pmel/sdig/las/client/main/Layout.java b/gwtui/pmel/sdig/las/client/main/Layout.java
@@ -1677,6 +1677,7 @@ void onAdvancedSearch(ClickEvent event) {
     @UiHandler("nextAdvancedSearch")
     void onAdvancedSearchNext(ClickEvent clickEvent) {
         runAdvancedSearch(advancedSearchOffset);
+        clickEvent.stopPropagation();
     }
     @UiHandler("prevAdvancedSearch")
     void onAdvancedSearchPrev(ClickEvent clickEvent) {
@@ -1685,5 +1686,6 @@ void onAdvancedSearchPrev(ClickEvent clickEvent) {
             offset = 0;
         }
         runAdvancedSearch(offset);
+        clickEvent.stopPropagation();
     }
 }
diff --git a/gwtui/pmel/sdig/las/client/main/Layout.ui.xml b/gwtui/pmel/sdig/las/client/main/Layout.ui.xml
@@ -88,6 +88,7 @@
                                 <m:MaterialIcon marginLeft="4" ui:field="home" iconType="HOME"></m:MaterialIcon>
                                 <m:MaterialIcon ui:field="back" iconType="ARROW_BACK" iconPosition="RIGHT"/>
                                 <m:MaterialLink fontWeight="BOLDER" fontSize="1.4em" text="Data" display="FLEX"></m:MaterialLink>
+                                <m:MaterialButton ui:field="prevAdvancedSearch" text="Prev" display="NONE"/><m:MaterialButton ui:field="nextAdvancedSearch" text="Next" display="NONE"/>
                                 <!--
                                 Doesn't quite work right, seems counter intuitive, just use the breadcrumbs for now.
                                 <m:MaterialIcon ui:field="back" iconType="ARROW_BACK" iconPosition="RIGHT"/>
@@ -309,7 +310,7 @@
         <m:MaterialContainer ui:field="main">
             <m:MaterialRow paddingTop="60" ui:field="advancedSearch">
                 <m:MaterialPanel marginLeft="8" marginTop="8" marginBottom="8">
-                    <m:MaterialButton ui:field="advancedSearchLaunch" text="Search"/><m:MaterialButton ui:field="prevAdvancedSearch" text="Prev" display="NONE"/><m:MaterialButton ui:field="nextAdvancedSearch" text="Next" display="NONE"/>
+                    <m:MaterialButton ui:field="advancedSearchLaunch" text="Search"/>
                 </m:MaterialPanel>
                 <m:MaterialRow>
                     <m:MaterialColumn grid="s4">

diff --git a/gwtui/pmel/sdig/las/client/main/UI.java b/gwtui/pmel/sdig/las/client/main/UI.java
@@ -636,6 +636,8 @@ public void onBreadcrumbSelect(BreadcrumbSelect event) {
                         layout.panel1.clearAnnotations();
                         layout.removeBreadcrumbs(1);
                         layout.advancedSearch.setDisplay(Display.BLOCK);
+                        layout.prevAdvancedSearch.setDisplay(Display.NONE);
+                        layout.nextAdvancedSearch.setDisplay(Display.NONE);
                         advancedSearch = true;
                         layout.clearDatasets();
                         layout.showDataProgress();
@@ -740,6 +742,8 @@ public void onClick(ClickEvent event) {
                     layout.infoHeader.setDisplay(Display.NONE);
                     advancedSearch = false;
                     layout.advancedSearch.setDisplay(Display.NONE);
+                    layout.prevAdvancedSearch.setDisplay(Display.NONE);
+                    layout.nextAdvancedSearch.setDisplay(Display.NONE);
                     layout.panel1.setVisible(true);
                     layout.panel1.clearAnnotations();
                     layout.panel1.clearPlot();
@@ -1059,6 +1063,8 @@ public void onInfo(Info event) {
                 layout.infoHeader.setDisplay(Display.NONE);
                 advancedSearch = false;
                 layout.advancedSearch.setDisplay(Display.NONE);
+                layout.prevAdvancedSearch.setDisplay(Display.NONE);
+                layout.nextAdvancedSearch.setDisplay(Display.NONE);
                 long id = event.getId();
                 layout.setInfoSelect(id);
                 String rid = id + ".json";
@@ -1498,6 +1504,8 @@ public void onClick(ClickEvent clickEvent) {
                 layout.infoHeader.setDisplay(Display.NONE);
                 advancedSearch = false;
                 layout.advancedSearch.setDisplay(Display.NONE);
+                layout.prevAdvancedSearch.setDisplay(Display.NONE);
+                layout.nextAdvancedSearch.setDisplay(Display.NONE);
                 layout.panel1.setVisible(true);
                 state.getPanelState(tp).setResultSet(results);
                 layout.setState(tp, state);
@@ -1878,6 +1886,8 @@ public void onSuccess(Method method, Dataset infoDataset) {
             layout.infoPanel.setDisplay(Display.BLOCK);
             advancedSearch = false;
             layout.advancedSearch.setDisplay(Display.NONE);
+            layout.prevAdvancedSearch.setDisplay(Display.NONE);
+            layout.nextAdvancedSearch.setDisplay(Display.NONE);
             layout.animate.setEnabled(false);
             layout.topMenuEnabled(false);
             layout.infoPanel.clear();
@@ -1909,6 +1919,8 @@ public void onSuccess(Method method, SearchResults searchResults) {
             layout.infoPanel.setDisplay(Display.NONE);
             layout.infoHeader.setDisplay(Display.NONE);
             layout.advancedSearch.setDisplay(Display.NONE);
+            layout.prevAdvancedSearch.setDisplay(Display.NONE);
+            layout.nextAdvancedSearch.setDisplay(Display.NONE);
             layout.infoPanel.clear();
             List<Dataset> searchDatasets = searchResults.getDatasetList();
             layout.advancedSearchTotal = searchResults.getTotal();
@@ -2515,6 +2527,8 @@ private void update(Product p) {
         layout.panel2.closeSettings();
         if (p.isClientPlot()) {
             layout.advancedSearch.setDisplay(Display.NONE);
+            layout.prevAdvancedSearch.setDisplay(Display.NONE);
+            layout.nextAdvancedSearch.setDisplay(Display.NONE);
             layout.panel1.getOutputPanel().setVisible(false);
             layout.panel1.clearPlot();
             makeDataRequest(variables, p);