From 2f5a820bc8703ce96a1f235ba0046c730c56e0be Mon Sep 17 00:00:00 2001 From: Matthew Foster Date: Thu, 17 Oct 2024 09:18:57 -0700 Subject: [PATCH] Revert "changes on hecate, not sure if they are ok but can't merge git changes with these hanging around." This reverts commit 14e56ceda3bb24ffcc039aea887328e01891f989. --- CODEOWNERS | 2 +- datasets.d/HakaiKCBuoy1hour.xml | 66 -- docker-compose.yml | 2 +- tash | 979 ------------------------------ views/HakaiHPLCSampleResearch.sql | 5 +- 5 files changed, 5 insertions(+), 1049 deletions(-) delete mode 100644 tash diff --git a/CODEOWNERS b/CODEOWNERS index ba0d4189..8035c32d 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @JessyBarrette +* @fostermh diff --git a/datasets.d/HakaiKCBuoy1hour.xml b/datasets.d/HakaiKCBuoy1hour.xml index 4c282dc5..64302dd6 100644 --- a/datasets.d/HakaiKCBuoy1hour.xml +++ b/datasets.d/HakaiKCBuoy1hour.xml @@ -523,23 +523,6 @@ This dataset is provisional. For science purposes, please refer to the dataset: - - - KCBuoy:WaterTemp_Std - WaterTemp_Std - double - - sea_water_temperature - SBE16 - TWtrKCBuoy_Std - degree_Celsius - 0.5 - time: standard_deviation (interval: 5.0 minutes) - WaterTemp_UQL WaterTemp_flags - - - - KCBuoy:WaterTemp_UQL WaterTemp_UQL @@ -647,23 +630,6 @@ This dataset is provisional. For science purposes, please refer to the dataset: - - - KCBuoy:WaterConductivity_Std - WaterConductivity_Std - double - - SBE16 - ConductivityKCBuoy_Std - S/m - 0.5 - time: standard_deviation (interval: 5.0 minutes) - WaterConductivity_UQL WaterConductivity_flags - sea_water_electrical_conductivity - - - - KCBuoy:WaterConductivity_UQL WaterConductivity_UQL @@ -772,22 +738,6 @@ This dataset is provisional. For science purposes, please refer to the dataset: - - KCBuoy:WaterPressure_Std - WaterPressure_Std - double - - SBE16 - PressureKCBuoy_Std - dbar - 0.5 - time: standard_deviation (interval: 5.0 minutes) - WaterPressure_UQL WaterPressure_flags - sea_water_pressure - - - - KCBuoy:WaterPressure_UQL WaterPressure_UQL @@ -896,22 +846,6 @@ This dataset is provisional. For science purposes, please refer to the dataset: - - KCBuoy:WaterSalinity_Std - WaterSalinity_Std - double - - SBE16 - SalinityKCBuoy_Std - 0.5 - time: standard_deviation (interval: 5.0 minutes) - WaterSalinity_UQL WaterSalinity_flags - sea_water_practical_salinity - 1e-3 - - - - KCBuoy:WaterSalinity_UQL WaterSalinity_UQL diff --git a/docker-compose.yml b/docker-compose.yml index 1b43ba2d..08eb32bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: erddap: - image: "axiom/docker-erddap:2.22-jdk17-openjdk" + image: "axiom/docker-erddap:2.24-jdk21-openjdk" restart: always container_name: ${CONTAINER_NAME:-erddap} # platform: linux/x86_64 diff --git a/tash b/tash deleted file mode 100644 index eb1d3832..00000000 --- a/tash +++ /dev/null @@ -1,979 +0,0 @@ -diff --git a/GenerateDatasetsXml.sh b/GenerateDatasetsXml.sh -index 9e0299e..86ae266 100644 ---- a/GenerateDatasetsXml.sh -+++ b/GenerateDatasetsXml.sh -@@ -1,6 +1,3 @@ - #!/bin/bash -- --if [ -f .env ]; then -- source .env --fi -+[[ -f ./.env ]] && export $(grep -v '^#' .env | xargs) - docker exec -it "${CONTAINER_NAME:-erddap}" bash -c "cd webapps/erddap/WEB-INF/ && bash GenerateDatasetsXml.sh -verbose $*" \ -diff --git a/README.md b/README.md -index 921edc0..3327c62 100644 ---- a/README.md -+++ b/README.md -@@ -9,12 +9,37 @@ Hakai deploy ERDDAP as docker containers by using the [docker-erddap](https://gi -  - See [GitHub Deployments](https://github.com/HakaiInstitute/hakai-erddap/deployments) for all active deployments maintained via this repository. -  --## Deployment -- --ERDDAP is deployed on , via docker-compose.  --See local `.env` file for configuration. -- --### Development -+## Configuration -+ -+The present repository is handled via CapRovers Applications. To configure a deployment, follow these steps: -+ -+- Install CapRover on the server -+- CapRover Application Configuration: -+ - Create a new application for your ERDDAP instance -+ - Set container HTTP port: 8080 -+ - Copy sample.env environment variables within `App. Configs` -> `Environment Variables` section and define the different parameters accordingly -+ - Define `Persistent Directories`: -+ - `/erddapData/` or defined `bigParentDirectory` environment variable -+ - `/datasets/` map to the local path on the server the file datasets are mounted -+ - `/algae_explorer` mapped to the directory on the server where the `algae explorer` files are mounted -+- Generate SSH key for GitHub CI -+- Add public key to ` ~/.ssh/authorized_keys` within remote server -+- Define Environment on GitHub -+ - Create new Environment -+ - Add environment protection (optional) -+ - Add Environment Secrets: -+ - CAPROVER_TOKEN -+ - SSH_HOST -+ - SSH_USERNAME -+ - SSH_KEY -+ - SSH_PORT -+ - Add Environment Variables: -+ - CAPROVER_URL -+ - CAPROVER_APP_NAME -+ - NAME -+ - URL -+ -+### Testing environment -  - For local development, make a copy of `sample.env` file as `.env`. - Update the environment variables to match the deployed parameters. -@@ -30,63 +55,10 @@ docker-compose up -d -  - If successful, you should be able to access your local ERDDAP instance at (default: ) -  --## How to create a new dataset -- --This is a step by step procedure to generate a new dataset: -- --1. See [development](#development) for create a local testing environment. --2. If the new dataset is form files, add the datawithin the [datasets](datasets) folder. Create a subdirectory for this dataset and structure the data accorindgly. --3. Active your docker daemon --4. Run the bash command: `sh Dasds.sh` --5. Answer the different questions accordingly to generate a first draft of the  -- xml associated with this dataset. --6. Importat! All the paths requested by ERDDAP should be referencing the base  -- directory (/datasets) within the container which is the local `./datasets/` -- folder mounted within the container. --7. Once all the answers completed, see what ERDDAP returned to you.  --8. If sucessfully, completed ERDDAP should return the dataset.xml associated to this dataset.  --9. You can also retrieve it at: [here](erddap/data/logs/GenerateDatasetsXml.out) within the log [folder](erddap/data/logs/) --10. Copy this xml file to [./datasets.d](./datasets.d/), and name the file with its datasetID. --11. Add the different missing metadata. --12. Once satisfied, you can test the dataset with the command `sh DasDds.sh` --13. Fix all the issues brought up by DasDds.sh --14. Once completed, restart your local instance of ERDDAP and see if that dataset is now available. -- --### Development Server -- --1. Once satisfied, commit the changes to the `development` branch.  --3. If needed, copy the file data to server within (/data2/erddap_data) and match the path you've used initially within [./datasets/](./datasets/) --3. Any changes to the development branch should be reflected on the [development -- erddap](https://goose.hakai.org/erddap) autimacally via a github action --4. Review development version. -- --### Production server -- --1. From the development branch, create a release branch. --2. Merge Master to the release branch, ignore any changes associated to other datasets in development --3. Create PR to master --4. Revise PR --5. Make sure that the file data (if needed) is available within the `catalogue.hakai.org` server at `/data/erddap_data` --6. Once happy with the PR, merge it. -- --### Sync datasets metadata -- --`Hakai-erddap` is using the `hakai-metadata-conversion` package to sync --periodically the different datasets metadata based on the latest changes --made within the Hakai Catalogue. -- --If any changes are available a PR to development should be automatically --generated. Merge the changes to development, and follow a similar method as --described within the [production server section](production-server). -- - ## Hakai Database integration -- --All views and tables generated from the different SQL queries made available in --the `view` directory are run nightly from the hecate.hakai.org server from the --master branch with the bash script [erddap_create_views.sh](erddap_create_views.sh) -+All views and tables generated from the different SQL queries made available in the `view` directory are run nightly from the hecate.hakai.org server from the master branch. -  - ## Continuous Integration -- - All commits to this repository are tested by different linter through a PR or commit to the development and master branches: - - python: black, isort - - sql: sqlfluff -diff --git a/datasets.d/development/HakaiHPLCResearch.xml b/datasets.d/development/HakaiHPLCResearch.xml -deleted file mode 100644 -index e23d24a..0000000 ---- a/datasets.d/development/HakaiHPLCResearch.xml -+++ /dev/null -@@ -1,812 +0,0 @@ -- -- hakai_erddap_sourceUrl -- org.postgresql.Driver -- erddap -- "HakaiHPLCSampleResearch" -- 10080 --  --  --  -- TimeSeriesProfile -- work_area,site_id -- project,survey,source,time -- COARDS, CF-1.6, ACDD-1.3 -- https://catalogue.hakai.org/dataset/ca-cioos_7fd3ec6c-083a-4942-84b4-215e69492072 -- Hakai Institute -- phytoplankton,abundance and biomass,chlorophyll a,climate change,coastal zone,British Columbia,Canada,hplc,CIOOS:phytoplanktonBiomassAndDiversity -- CIOOS: CIOOS Essential Ocean Variables Vocabulary -- https://creativecommons.org/licenses/by/4.0 -- (local database) -- CF Standard Name Table v70 -- High performance liquid chromatography (HPLC) is a method that quantifies concentrations of phytoplankton pigments from bulk water samples. Phytoplankton species groupings (i.e. diatoms, dinoflagellates, etc.) typically contain different pigments, and concentrations of pigments, used for photosynthesis. These differences make it possible to use statistical methods (e.g. chemotaxonomic analysis, CHEMTAX) to estimate phytoplankton group-level biomass contributions within a bulk water sample. These methods provide unique and valuable insight into phytoplankton community dynamics as they quantify the full phytoplankton size-spectrum, are relatively fast and cost-effective and, are directly relatable to remote sensing (i.e. pigments drive differences in light measured by satellites). Furthermore, HPLC is considered the gold-standard for quantifying phytoplankton total chlorophyll a concentrations (TChla, proxy for bulk phytoplankton biomass) required for satellite remote sensing validation. -- --The Hakai institute has been collecting HPLC samples in the Northern Salish Sea (NSS) at the QU39 long-term ecological research station (LTER) and at various stations on the central coast of British Columbia since 2015. These data are used to monitor phytoplankton group level dynamics, build knowledge of different environmental conditions driving their variability (Del Bel Belluz et al., 2021), investigate linkages to the food web and carbonate system, evaluate long-term change and, to build regional remote sensing models (Vishnu et al., 2022). Data from station QU39 within the NSS are collected weekly and from 2015 -2019 at 5m depth and afterwards at 0, 5 , 10 and 20m depth. On the central coast of British Columbia, data are collected monthly at 5m depth.  -- --Samples are analyzed at the University of South Carolina Baruch Institute for Marine and Coastal Sciences using the USC method. This method was evaluated and is detailed in the NASA Fourth SeaWiFS HPLC Analysis Round-Robin Experiment (SeaHARRE-4, Hooker et al., 2010). -- --Phytoplankton form the base of marine food webs and play key roles in biogeochemical cycling and carbon sequestration. The high turnover rates of phytoplankton species make them ideal sentinels of environmental change as they quickly respond to perturbations; however, a paucity of data, notably in terms of community composition, exists across coastal systems hindering the derivation of baseline conditions to assess change. This knowledge gap is especially pertinent when considering that coastal regions are experiencing rapid climate-driven change including increased temperature and acidification, reduced oxygen and altered freshwater dynamics. The synergy of these influences has the potential to alter phytoplankton community and size structure having large downstream implications on ecosystem resiliency, food production and climate regulation. -- High performance liquid chromatography phytoplankton pigment timeseries for the northern Salish Sea and central coast, British Columbia -- project,work_area,survey,site_id,source -- Oceanography##Limitations: --Care should be taken when using HPLC phytoplankton pigment concentrations for community based analysis. Species within different phytoplankton groupings can show comparable pigment profiles or variable presence/absence of marker pigments. Pigment concentrations can also vary as a result of environmental conditions (light, nutrients, etc.). In addition, small cryptic species with similar pigment profiles as broader groupings are often not separated and are included in the biomass of the most similar grouping. Furthermore, endosymbiosis can result in mixotrophic grazers displaying pigment profiles of their endosymbiont (i.e. cryptophyte pigments within the ciliate Mesodinium rubrum). These issues can result in misclassifications or error when using chemotaxonomic and other pigment based methods. Strong knowledge of expected phytoplankton species is required prior to analysis and outputs are meant to represent broad trends in phytoplankton species composition.onGoing7fd3ec6c-083a-4942-84b4-215e69492072ca.cioos2024-07-22T20:18:57.436Z1.0Metadata record history: --- additionalDocumentation: -- - authority: URL -- code: https://ntrs.nasa.gov/citations/20110008482 -- title: -- en: The Fourth SeaWiFS HPLC Analysis Round-Robin Experiment (SeaHARRE-4) -- fr: "La quatri\xE8me exp\xE9rience Round Robin d'analyse HPLC de SeaWiFS (SeaHarre-4)" -- translations: -- fr: -- message: "text translated using the Amazon translate service / texte traduit\ -- \ \xE0 l'aide du service de traduction Amazon" -- verified: false -- scope: Dataset -- statement: -- en: Explanation of HPLC USC analysis method and comparison with other methods -- fr: "Explication de la m\xE9thode d'analyse HPLC USC et comparaison avec d'autres\ -- \ m\xE9thodes" -- translations: -- fr: -- message: "text translated using the Amazon translate service / texte traduit\ -- \ \xE0 l'aide du service de traduction Amazon" -- verified: false --Hakai InstituteinstitutionHakai InstituteCampbell RiverCanadahttps://www.hakai.org/https://ror.org/02pry0c91Hakai InstituteinstitutionHakai InstituteCampbell RiverCanadahttps://www.hakai.org/https://ror.org/02pry0c91Del Bel Belluz, Justin;Jordison, Drew;Evans, Wiley;Hakai Institute;Tula Foundationcustodian,author,editor,pointOfContact,principalInvestigator,originator;custodian,pointOfContact,contributor;custodian,principalInvestigator;publisher,owner,distributor;funderhttps://doi.org/10.21966/bw2d-tg65https://catalogue.hakai.org/dataset/ca-cioos_7fd3ec6c-083a-4942-84b4-215e69492072https://hakaiinstitute.github.io/hakai-metadata-entry-form#/en/hakai/7U7b8oPpeTN6gjvXlUCTGJr5pga2/-O25qzW3OpioeACGpRHl --  -- project -- project -- String --  --  -- Project --  --  --  -- work_area -- work_area -- String --  --  -- Work Area --  --  --  -- survey -- survey -- String --  --  -- Survey --  --  --  -- site_id -- site_id -- String --  --  -- Site Id -- timeseries_id --  --  --  -- latitude -- latitude -- float --  --  -- latitude -- latitude -- degrees_north --  --  --  -- longitude -- longitude -- float --  --  -- longitude -- longitude -- degrees_east --  --  --  -- source -- source -- String --  --  -- Source --  --  --  -- project_specific_id -- project_specific_id -- String --  --  -- Project Specific Id --  --  --  -- hakai_id -- hakai_id -- String --  --  -- Hakai Id --  --  --  -- line_out_depth -- line_out_depth -- double --  --  -- Line Out Depth -- m --  --  --  -- pressure_transducer_depth -- pressure_transducer_depth -- double --  --  -- Pressure Transducer Depth -- m --  --  --  -- depth -- depth -- double --  --  -- Depth -- depth -- m -- pressure_transducer_depth if available otherse line_out_depth --  --  --  -- collected -- time -- double --  --  -- Time -- Collected -- time -- seconds since 1970-01-01T00:00:00Z -- profile_id --  --  --  -- preserved -- preserved -- double --  --  -- Time -- Preserved -- time -- seconds since 1970-01-01T00:00:00Z --  --  --  -- analyzed -- analyzed -- double --  --  -- Time -- Analyzed -- time -- seconds since 1970-01-01T00:00:00Z --  --  --  -- acidified -- acidified -- boolean --  --  -- Acidified --  --  --  -- volume -- volume -- double --  --  -- Volume -- ml --  --  --  -- lab_technician -- lab_technician -- String --  --  -- Lab Technician --  --  --  -- filter_portion -- filter_portion -- double --  --  -- Filter Portion --  --  --  -- pre_weight_mg -- pre_weight_mg -- double --  --  -- Pre Weight -- mg --  --  --  -- post_weight_mg -- post_weight_mg -- double --  --  -- Post Weight -- mg --  --  --  -- filter_size_mm -- filter_size_mm -- double --  --  -- Filter Size -- mm --  --  --  -- filter_type -- filter_type -- String --  --  -- Filter Type --  --  --  -- extraction_duration -- extraction_duration -- String --  --  -- Extraction Duration -- minutes --  --  --  -- extraction_method -- extraction_method -- String --  --  -- Extraction Method --  --  --  -- initial_extraction_volume -- initial_extraction_volume -- double --  --  -- Initial Extraction Volume -- ml --  --  --  -- volume_filtered_ml -- volume_filtered_ml -- double --  --  -- Volume Filtered Ml -- ml --  --  --  -- final_extraction_volume -- final_extraction_volume -- double --  --  -- Final Extraction Volume -- ml --  --  --  -- tac_peak -- tac_peak -- double --  --  -- Tac Peak --  --  --  -- _19_but -- a_19_but -- double --  --  -- 19 But -- kg/m^3 -- mass_concentration_of_19_butanoyloxyfucoxanthin_in_sea_water --  --  --  -- _19_hex -- a_19_hex -- double --  --  -- 19 Hex -- kg/m^3 -- mass_concentration_of_19_hexanoyloxyfucoxanthin_in_sea_water --  --  --  -- alpha_carotene -- alpha_carotene -- double --  --  -- Alpha Carotene -- mass_concentration_of_alpha_carotene_in_sea_water -- kg/m^3 --  --  --  -- alloxanthin -- alloxanthin -- double --  --  -- Alloxanthin -- kg/m^3 --  --  --  -- antheraxanthin -- antheraxanthin -- double --  --  -- Antheraxanthin -- kg/m^3 --  --  --  -- beta_carotene -- beta_carotene -- double --  --  -- Beta Carotene -- mass_concentration_of_beta_carotene_in_sea_water -- kg/m^3 --  --  --  -- c2mgdg -- c2mgdg -- double --  --  -- C2MGDG -- kg/m^3 --  --  --  --  -- chl_a -- chl_a -- double --  --  -- Chlorophyll-A -- Concentration Of Chlorophyll In Sea Water -- concentration_of_chlorophyll_in_sea_water --  --  --  -- chl_b -- chl_b -- double --  --  -- Chlorophyll-B -- mass_concentration_of_chlorophyll_b_in_sea_water -- kg/m^3 --  --  --  -- chl_c1 -- chl_c1 -- double --  --  -- Chlorophyll-C1 --  --  --  -- chl_c1_c2 -- chl_c1_c2 -- double --  --  -- CHL C1 C2 -- mass_concentration_of_chlorophyll_c1_and_chlorophyll_c2_in_sea_water -- kg/m^3 --  --  --  -- chl_c2 -- chl_c2 -- double --  --  -- Chlorophyll-C2 -- kg/m^3 --  --  --  -- chl_c3 -- chl_c3 -- double --  --  -- Chlorophyll-C3 -- mass_concentration_of_chlorophyll_c3_in_sea_water -- kg/m^3 --  --  --  -- chl_ide_a -- chl_ide_a -- double --  --  -- Chl Ide A -- kg/m^3 --  --  --  -- chla_allomer -- chla_allomer -- double --  --  -- kg/m^3 -- Chlorophyll-A Allomer -- concentration_of_chlorophyll_in_sea_water --  --  --  -- chla_prime -- chla_prime -- double --  --  -- kg/m^3 -- Chlorophyll-A prime --  --  --  -- diadinoxanthin -- diadinoxanthin -- double --  --  -- Diadinoxanthin -- kg/m^3 -- mass_concentration_of_diadinoxanthin_in_sea_water --  --  --  -- diatoxanthin -- diatoxanthin -- double --  --  -- Diatoxanthin -- kg/m^3 --  --  --  -- dv_chl_a -- dv_chl_a -- double --  --  -- DV Chlorophyll-A -- kg/m^3 --  --  --  -- fuco -- fuco -- double --  --  -- Fuco -- kg/m^3 -- mass_concentration_of_fucoxanthin_in_sea_water --  --  --  -- gyroxanthin_diester -- gyroxanthin_diester -- double --  --  -- Gyroxanthin Diester -- kg/m^3 --  --  --  -- lutein -- lutein -- double --  --  -- Lutein -- kg/m^3 -- mass_concentration_of_lutein_in_sea_water --  --  --  -- me_chlide -- me_chlide -- double --  --  -- kg/m^3 --  --  --  -- mgdvp -- mgdvp -- double --  --  -- kg/m^3 --  --  --  -- neoxanthin -- neoxanthin -- double --  --  -- Neoxanthin -- kg/m^3 --  --  --  -- peri -- peri -- double --  --  -- Peri -- kg/m^3 --  --  --  -- phbide -- phbide -- double --  --  -- Phbide -- kg/m^3 --  --  --  -- phphyt -- phphyt -- double --  --  -- PHPHYT -- kg/m^3 --  --  --  -- prasinoxanthin -- prasinoxanthin -- double --  --  -- Prasinoxanthin -- kg/m^3 -- mass_concentration_of_prasinoxanthin_in_sea_water --  --  --  -- violaxanthin -- violaxanthin -- double --  --  -- Violaxanthin -- kg/m^3 -- mass_concentration_of_violaxanthin_in_sea_water --  --  --  -- zeaxanthin -- zeaxanthin -- double --  --  -- Zeaxanthin -- kg/m^3 -- mass_concentration_of_zeaxanthin_in_sea_water --  --  --  -- total_chl_a -- total_chl_a -- double --  --  -- kg/m^3 -- Concentration Of Total Chlorophyll-A In Sea Water --  --  --  -- all_chl_a -- all_chl_a -- double --  --  -- kg/m^3 -- Concentration Of All Chlorophyll-A In Sea Water --  --  --  -- all_chl_a_flag -- all_chl_a_flag -- String --  --  -- All Chl A Flag --  --  --  -- analyzing_lab -- analyzing_lab -- String --  --  -- Analyzing Lab --  --  --  -- row_flag -- row_flag -- String --  --  -- Row Flag --  --  --  -- quality_level -- quality_level -- String --  --  -- Quality Level --  --  --  -- comments -- comments -- String --  --  -- Comments --  --  --  -- quality_log -- quality_log -- String --  --  -- Quality Log --  --  -- -diff --git a/docker-compose-local.yml b/docker-compose-local.yml -deleted file mode 100644 -index 3416ffd..0000000 ---- a/docker-compose-local.yml -+++ /dev/null -@@ -1,30 +0,0 @@ --# see the .env file to set the variables used here --version: "2" --services: -- erddap: -- image: "axiom/docker-erddap:2.23-jdk17-openjdk" -- restart: always -- container_name: ${CONTAINER_NAME:-erddap} -- platform: linux/x86_64 -- env_file: -- - .env -- ports: -- - "${HOST_PORT:-8090}:8080" -- volumes: -- - "./erddap/conf/robots.txt:/usr/local/tomcat/webapps/ROOT/robots.txt" -- - "./erddap/content:/usr/local/tomcat/content/erddap" -- - "./erddap/data:/erddapData" -- - "${DATASETS_DIR:-./datasets}:/datasets" -- - "./datasets.d:/datasets.d:ro" -- - "./init.d:/init.d" -- # - "/mnt/efs/algex:/algae_explorer" -- - "./datasets.d:/datasets.d" -- healthcheck: -- test: -- [ -- "CMD", -- "curl", -- "-f", -- "http://localhost:${HOST_PORT}/erddap/index.html" -- ] -- interval: 10s diff --git a/views/HakaiHPLCSampleResearch.sql b/views/HakaiHPLCSampleResearch.sql index d56da893..ceb3ec8a 100644 --- a/views/HakaiHPLCSampleResearch.sql +++ b/views/HakaiHPLCSampleResearch.sql @@ -13,7 +13,8 @@ join eims.output_sites y on x.site_id = y.name and x.work_area = y.work_area WHERE x.organization = 'HAKAI' - and x.row_flag = 'Results' - -- AND quality_level IN ('Principal Investigator', 'Technicianmr') + AND x.row_flag = 'Results' + AND quality_level IN ('Principal Investigator', 'Technicianmr') + AND x.hplc.all_chl_a_flag IN ('AV') -- AND site_id IN ('QU39') ;