fix: Bugfix/date picker - restructuring and minor colour adjustment

backend/startup.sh

@@ -66,4 +66,9 @@ if [ -f "/certs/zscaler-ca.crt" ]; then
   keytool -import -trustcacerts -file /certs/zscaler-ca.crt -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt
 fi
 
-mvn -ntp spring-boot:run -Dspring-boot.run.jvmArguments="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5006"
+# Import certificates - Needed by CGI laptops for development
+if [ -f "zscaler-cgi.crt" ]; then
+  keytool -import -trustcacerts -file zscaler-cgi.crt -keystore /opt/java/openjdk/lib/security/cacerts -storepass changeit -noprompt
+fi
+
+mvn -ntp spring-boot:run -Dspring-boot.run.jvmArguments="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5006" -Dspring-boot.run.profiles="dev-local"

docker-compose.yml

@@ -54,7 +54,7 @@ services:
       - $HOME/zscaler-certs:/certs
     working_dir: /app
     environment:
-      DATABASE_HOST: nrcdb03.bcgov
+      DATABASE_HOST: ${DATABASE_HOST}
       DATABASE_PORT: "1543"
       DATABASE_USER: ${DATABASE_USER}
       DATABASE_PASSWORD: ${DATABASE_PASSWORD}
@@ -72,12 +72,12 @@ services:
     environment:
       <<: *db-vars
     volumes: ["/pgdata"]
-    ports: ["5432:5432"]
-    healthcheck:
-      test: pg_isready -U postgres
-      interval: 5s
-      timeout: 5s
-      retries: 5
+    ports: ["${POSTGRES_EXPOSED_PORT}:5432"]  #changed to 5433 to avoid conflict with local postgres
+    # healthcheck:
+    #   test: pg_isready -U nr-silva
+    #   interval: 5s
+    #   timeout: 5s
+    #   retries: 5
     image: postgis/postgis:13-master
 
   backend-native:

frontend/src/components/SilvicultureSearch/Openings/AdvancedSearchDropdown/AdvancedSearchDropdown.scss

@@ -3,97 +3,126 @@
 @use '@carbon/type';
 
 .advanced-search-dropdown {
-    background-color: var(--#{vars.$bcgov-prefix}-layer-02);
-    position: absolute;
-    z-index: 2;
-    width: 65.66%;
-    //these are for the nested elements
-    .advanced-search-container{
-        box-shadow: 0px 2px 6px 0px #0000004D;
-    }
-    input{
-        background-color: var(--bx-field-01);
-        border-bottom: 1px solid var(--bx-border-strong-01);
-    }
-    .multi-select .bx--list-box__field--wrapper{
-        background-color: var(--bx-field-01);
-        border-bottom: 1px solid var(--bx-border-strong-01);
-    }
+  background-color: var(--#{vars.$bcgov-prefix}-layer-02);
+  padding-top: 20px;
+  padding-bottom: 20px;
+  padding-right: 20px;
+  position: absolute;
+  z-index: 2;
+  box-shadow: 0px 2px 6px 0px #0000004D;
+
+  legend {
+    font-size: 16px;
+    line-height: 20px;
+    letter-spacing: 0.16px;
+    color: var(--bx-text-primary);
+    white-space: nowrap;
+  }
 
-}
+  label {
+    font-size: 16px;
+    line-height: 20px;
+    letter-spacing: 0.16px;
+    white-space: nowrap;
+    color: var(--#{vars.$bcgov-prefix}-text-primary);
+  } 
 
-.horizontal-checkbox-group {
-    display: flex;
-    flex-wrap: wrap;
-    max-width: 462px;
+  .bx--row {
+    padding: 5px;
+  }
 
-    .#{vars.$bcgov-prefix}--checkbox-label-text{
-        font-size: 14px;
-        line-height: 18px;
-        letter-spacing:0.16px;
-        margin-right: 16px;
-        color: var(--bx-text-primary);
-    }
-}
+  .orgUnitCol {
+    padding-right: 10px;
+  }
 
-.date-type-col{
-    padding: 0px;
-    padding-left: 16px;
-}
-.date-selectors-col{
-    padding-left: 0px;
-}
+  .clientLocationCodeCol {
+    padding-right: 10px;
+  }
+  
+  .timeberMarkCol {
+    padding-right: 10px;
+  }
 
-@media only screen and (min-width: 320px) {
-    .advanced-search-dropdown {
-        width: 93.5%;
-      }
-      .date-type-col{
-        padding: 0px;
-        padding-left: 16px;
-        padding-right: 16px;
-    }
-    .date-selectors-col{
-        padding-left: 16px;
-        padding-top:8px;
-    }
-    .flex-status-list{
-        flex-direction: column;
-    }
+
+  input {
+    background-color: var(--bx-field-01);
+    border-bottom: 1px solid var(--bx-border-strong-01);
+  }
+
+  input::placeholder {
+    color: var(--#{vars.$bcgov-prefix}-text-secondary);
   }
-  /* Medium - Up to 672px */
-  @media only screen and (min-width: 672px) {
-    .advanced-search-dropdown {
-        width: 96.6%;
-      }
-    .flex-status-list{
-        flex-direction: column;
-    }
-
+
+  input:disabled::placeholder {
+    color: var(--#{vars.$bcgov-prefix}-text-secondary);
   }
-  /* Large - Up to 1056px  */
-  @media only screen and (min-width: 1056px) {
-    .advanced-search-dropdown {
-        width: 56.3%;
-      }
-      .flex-status-list{
-        flex-direction: row;
-    }
+
+  .bx--label--disabled {
+    color: var(--#{vars.$bcgov-prefix}-text-secondary);
   }
-
-  /* Max - Up to 1584px */
-  @media only screen and (min-width: 1584px) {
-    .advanced-search-dropdown {
-        width: 60.66%;
-      }
-      .date-selectors-col{
-        padding: 0px;
-    }
+
+  #tooltip {
+    border: 0;
+    padding-bottom: 0px;
+    padding-top: 0px;
+    background-color: var(--#{vars.$bcgov-prefix}-layer-02);
   }
-  /* Extra Max - Up to 1784px */
-  @media only screen and (min-width: 1784px) {
-    .advanced-search-dropdown {
-        width: 70.66%;
-      }
+
+  .multi-select .bx--list-box__field--wrapper {
+    background-color: var(--bx-field-01);
+    border-bottom: 1px solid var(--bx-border-strong-01);
   }
+}
+
+// @media only screen and (min-width: 320px) {
+//     .advanced-search-dropdown {
+//         width: 93.5%;
+//       }
+//       .date-type-col{
+//         padding: 0px;
+//         padding-left: 16px;
+//         padding-right: 16px;
+//     }
+//     .date-selectors-col{
+//         padding-left: 16px;
+//         padding-top:8px;
+//     }
+//     .flex-status-list{
+//         flex-direction: column;
+//     }
+//   }
+//   /* Medium - Up to 672px */
+//   @media only screen and (min-width: 672px) {
+//     .advanced-search-dropdown {
+//         width: 96.6%;
+//       }
+//     .flex-status-list{
+//         flex-direction: column;
+//     }
+
+//   }
+//   /* Large - Up to 1056px  */
+//   @media only screen and (min-width: 1056px) {
+//     .advanced-search-dropdown {
+//         width: 56.3%;
+//       }
+//       .flex-status-list{
+//         flex-direction: row;
+//     }
+//   }
 
+//   /* Max - Up to 1584px */
+//   @media only screen and (min-width: 1584px) {
+//     .advanced-search-dropdown {
+//         width: 80%;
+//       }
+//       .date-selectors-col{
+//         padding: 0px;
+//     }
+//   }
+//   /* Extra Max - Up to 1784px */
+//   @media only screen and (min-width: 1784px) {
+//     .advanced-search-dropdown {
+//         width: 70.66%;
+//       }
+//   }