From ed458e855adaa3df14cb73aeeb4742de10c6bd68 Mon Sep 17 00:00:00 2001 From: Patrick Schaefer Date: Fri, 30 May 2025 11:57:44 -0400 Subject: [PATCH 01/20] Q2 2025 Update --- schemas/data/src/addition/ActivityType.json | 5 +- .../data/src/addition/CharacteristicName.json | 4 +- .../data/src/addition/MeasurementUnit.json | 10 ++- .../ResultAnalyticalMethodContext.json | 17 +++- .../ResultDetectionQuantitationLimitUnit.json | 10 ++- schemas/data/src/addition/ResultUnit.json | 10 ++- .../SampleCollectionEquipmentName.json | 3 + .../data/src/locales/ActivityGroupType.json | 10 +++ schemas/data/src/locales/ActivityType.json | 10 +++ .../data/src/locales/CharacteristicName.json | 32 ++++++- .../ResultAnalyticalMethodContext.json | 90 +++++++++++++++++++ .../SampleCollectionEquipmentName.json | 10 +++ ...ticName-Nutrient-ResultSampleFraction.json | 1 + ...aracteristicName-ResultSampleFraction.json | 1 + .../ActivityType-ActivityGroupType.json | 3 +- ...acteristicName-CharacteristicWQXGroup.json | 3 + ...eristicName-Guideline-MeasurementUnit.json | 1 + .../CharacteristicName-MeasurementUnit.json | 1 + ...haracteristicWQXGroup-MeasurementUnit.json | 3 +- schemas/data/src/lookup/MeasurementUnit.json | 1 + .../data/src/subset/CharacteristicName.json | 1 + 21 files changed, 217 insertions(+), 9 deletions(-) create mode 100644 schemas/data/src/addition/SampleCollectionEquipmentName.json diff --git a/schemas/data/src/addition/ActivityType.json b/schemas/data/src/addition/ActivityType.json index 951995cb..28c5eeb4 100644 --- a/schemas/data/src/addition/ActivityType.json +++ b/schemas/data/src/addition/ActivityType.json @@ -1 +1,4 @@ -["Quality Control"] +[ + "Quality Control", + "Unspecified" +] diff --git a/schemas/data/src/addition/CharacteristicName.json b/schemas/data/src/addition/CharacteristicName.json index 5041707c..70044ce0 100644 --- a/schemas/data/src/addition/CharacteristicName.json +++ b/schemas/data/src/addition/CharacteristicName.json @@ -2,6 +2,7 @@ "2,4- & 2,5-Dichlorophenol", "2,3,4,5- & 2,3,5,6- Tetrachlorophenol", "3-Pyridinecarboxamide, N-(2,4-difluorophenyl)-2-[3-(trifluoromethyl)phenoxy]-", + "Ammonia, un-ionized", "BDE-049", "BDE-071", "BDE-077", @@ -14,5 +15,6 @@ "m- & p-Chlorophenol", "Phosphorus, elemental", "p-Chlorophenol", - "Thorium" + "Thorium", + "Transmittance at 254 nm" ] diff --git a/schemas/data/src/addition/MeasurementUnit.json b/schemas/data/src/addition/MeasurementUnit.json index d7f89249..5b4e31bc 100644 --- a/schemas/data/src/addition/MeasurementUnit.json +++ b/schemas/data/src/addition/MeasurementUnit.json @@ -1 +1,9 @@ -["per mil AIR", "per mil VCDT", "per mil VPDB", "per mil VSMOW", "TCU", "T.O.N"] +[ + "%/cm", + "per mil AIR", + "per mil VCDT", + "per mil VPDB", + "per mil VSMOW", + "TCU", + "T.O.N" +] diff --git a/schemas/data/src/addition/ResultAnalyticalMethodContext.json b/schemas/data/src/addition/ResultAnalyticalMethodContext.json index ee4da34e..41a6543c 100644 --- a/schemas/data/src/addition/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/addition/ResultAnalyticalMethodContext.json @@ -1 +1,16 @@ -["DOI", "PROPRIETARY", "VMV", "Seal", "Oakton", "ON MECP"] +[ + "APHA_SM24ED", + "BC MOE", + "DOI", + "Hydrolab", + "METER Group", + "Oakton", + "ON MECP", + "PROPRIETARY", + "RBR", + "Seal", + "Solinist", + "Turner Designs", + "USGS", + "VMV" +] diff --git a/schemas/data/src/addition/ResultDetectionQuantitationLimitUnit.json b/schemas/data/src/addition/ResultDetectionQuantitationLimitUnit.json index bfeea036..5b4e31bc 100644 --- a/schemas/data/src/addition/ResultDetectionQuantitationLimitUnit.json +++ b/schemas/data/src/addition/ResultDetectionQuantitationLimitUnit.json @@ -1 +1,9 @@ -["per mil AIR", "per mil VCDT", "per mil VPDB", "per mil VSMOW", "TCU"] +[ + "%/cm", + "per mil AIR", + "per mil VCDT", + "per mil VPDB", + "per mil VSMOW", + "TCU", + "T.O.N" +] diff --git a/schemas/data/src/addition/ResultUnit.json b/schemas/data/src/addition/ResultUnit.json index d7f89249..5b4e31bc 100644 --- a/schemas/data/src/addition/ResultUnit.json +++ b/schemas/data/src/addition/ResultUnit.json @@ -1 +1,9 @@ -["per mil AIR", "per mil VCDT", "per mil VPDB", "per mil VSMOW", "TCU", "T.O.N"] +[ + "%/cm", + "per mil AIR", + "per mil VCDT", + "per mil VPDB", + "per mil VSMOW", + "TCU", + "T.O.N" +] diff --git a/schemas/data/src/addition/SampleCollectionEquipmentName.json b/schemas/data/src/addition/SampleCollectionEquipmentName.json new file mode 100644 index 00000000..3cf1d815 --- /dev/null +++ b/schemas/data/src/addition/SampleCollectionEquipmentName.json @@ -0,0 +1,3 @@ +[ + "Beta Sampler" +] diff --git a/schemas/data/src/locales/ActivityGroupType.json b/schemas/data/src/locales/ActivityGroupType.json index 95cd1e2b..0246c0de 100644 --- a/schemas/data/src/locales/ActivityGroupType.json +++ b/schemas/data/src/locales/ActivityGroupType.json @@ -67,6 +67,16 @@ "en": null, "fr": null } + }, + "Unspecified": { + "name": { + "en": "Unspecified", + "fr": null + }, + "description": { + "en": null, + "fr": null + } } } } \ No newline at end of file diff --git a/schemas/data/src/locales/ActivityType.json b/schemas/data/src/locales/ActivityType.json index 54236cea..4fd6620c 100644 --- a/schemas/data/src/locales/ActivityType.json +++ b/schemas/data/src/locales/ActivityType.json @@ -547,6 +547,16 @@ "en": null, "fr": null } + }, + "Unspecified": { + "name": { + "en": "Unspecified", + "fr": null + }, + "description": { + "en": null, + "fr": null + } } } } \ No newline at end of file diff --git a/schemas/data/src/locales/CharacteristicName.json b/schemas/data/src/locales/CharacteristicName.json index b6baa7e3..e306d80c 100644 --- a/schemas/data/src/locales/CharacteristicName.json +++ b/schemas/data/src/locales/CharacteristicName.json @@ -1678,7 +1678,17 @@ "fr": null } }, - "7-Methylbenzo[a]pyrene": { + "6PPD-quinone": { + "name": { + "en": "6PPD-quinone", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, + "7-Methylbenzo[a]pyrene": { "name": { "en": "7-Methylbenzo[a]pyrene", "fr": null @@ -2148,6 +2158,16 @@ "fr": null } }, + "Ammonia, un-ionized": { + "name": { + "en": "Ammonia, un-ionized", + "fr": "Ammoniac non ionisé" + }, + "description": { + "en": null, + "fr": null + } + }, "Ammonia and ammonium": { "name": { "en": "Ammonia and ammonium", @@ -12928,6 +12948,16 @@ "fr": null } }, + "Transmittance at 254 nm": { + "name": { + "en": "Transmittance at 254 nm", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "Transparency, Secchi tube with disk": { "name": { "en": "Transparency, Secchi tube with disk", diff --git a/schemas/data/src/locales/ResultAnalyticalMethodContext.json b/schemas/data/src/locales/ResultAnalyticalMethodContext.json index 3715259c..fe119c69 100644 --- a/schemas/data/src/locales/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/locales/ResultAnalyticalMethodContext.json @@ -58,6 +58,16 @@ "fr": null } }, + "APHA_SM24ED": { + "name": { + "en": "APHA_SM24ED", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "ASTM": { "name": { "en": "ASTM", @@ -68,6 +78,16 @@ "fr": null } }, + "BC MOE": { + "name": { + "en": "BC MOE", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "DIN": { "name": { "en": "DIN", @@ -128,6 +148,16 @@ "fr": null } }, + "Hydrolab": { + "name": { + "en": "Hydrolab", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "IDEXX": { "name": { "en": "IDEXX", @@ -168,6 +198,16 @@ "fr": null } }, + "METER Group": { + "name": { + "en": "METER Group", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "MICROLOGY LABS": { "name": { "en": "MICROLOGY LABS", @@ -178,6 +218,16 @@ "fr": null } }, + "Oakton": { + "name": { + "en": "Oakton", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "ON MECP": { "name": { "en": "ON MECP", @@ -208,6 +258,16 @@ "fr": null } }, + "RBR": { + "name": { + "en": "RBR", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "Seal": { "name": { "en": "Seal", @@ -218,6 +278,16 @@ "fr": null } }, + "Solinist": { + "name": { + "en": "Solinist", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "THERMO-SCIENTIFIC": { "name": { "en": "THERMO-SCIENTIFIC", @@ -228,6 +298,16 @@ "fr": null } }, + "Turner Designs": { + "name": { + "en": "Turner Designs", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "USEPA": { "name": { "en": "USEPA", @@ -238,6 +318,16 @@ "fr": null } }, + "USGS": { + "name": { + "en": "USGS", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "VMV": { "name": { "en": "VMV", diff --git a/schemas/data/src/locales/SampleCollectionEquipmentName.json b/schemas/data/src/locales/SampleCollectionEquipmentName.json index 950c64bc..88aac940 100644 --- a/schemas/data/src/locales/SampleCollectionEquipmentName.json +++ b/schemas/data/src/locales/SampleCollectionEquipmentName.json @@ -18,6 +18,16 @@ "fr": null } }, + "Beta Sampler": { + "name": { + "en": "Beta Sampler", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "DH-81": { "name": { "en": "DH-81", diff --git a/schemas/data/src/logic/CharacteristicName-Nutrient-ResultSampleFraction.json b/schemas/data/src/logic/CharacteristicName-Nutrient-ResultSampleFraction.json index 6cd9af2e..7d4a6cf4 100644 --- a/schemas/data/src/logic/CharacteristicName-Nutrient-ResultSampleFraction.json +++ b/schemas/data/src/logic/CharacteristicName-Nutrient-ResultSampleFraction.json @@ -19,6 +19,7 @@ "CharacteristicName": { "enum": [ "Ammonia", + "Ammonia, un-uonized", "Ammonia and ammonium", "Ammonium", "Inorganic nitrogen (ammonia, nitrate and nitrite)", diff --git a/schemas/data/src/logic/CharacteristicName-ResultSampleFraction.json b/schemas/data/src/logic/CharacteristicName-ResultSampleFraction.json index 66b74731..8a0fa00c 100644 --- a/schemas/data/src/logic/CharacteristicName-ResultSampleFraction.json +++ b/schemas/data/src/logic/CharacteristicName-ResultSampleFraction.json @@ -12,6 +12,7 @@ "enum": [ "Aluminum", "Ammonia", + "Ammonia, un-ionized", "Ammonia and ammonium", "Ammonium", "Antimony", diff --git a/schemas/data/src/lookup/ActivityType-ActivityGroupType.json b/schemas/data/src/lookup/ActivityType-ActivityGroupType.json index 6f2dbc23..b370015e 100644 --- a/schemas/data/src/lookup/ActivityType-ActivityGroupType.json +++ b/schemas/data/src/lookup/ActivityType-ActivityGroupType.json @@ -62,5 +62,6 @@ "Sample-Other": "Subsample", "Sample-Positive Control": "Subsample", "Sample-Routine": "Subsample", - "Sample-Routine Resample": "Subsample" + "Sample-Routine Resample": "Subsample", + "Unspecified": "Unspecified" } diff --git a/schemas/data/src/lookup/CharacteristicName-CharacteristicWQXGroup.json b/schemas/data/src/lookup/CharacteristicName-CharacteristicWQXGroup.json index 48640d49..1af82934 100644 --- a/schemas/data/src/lookup/CharacteristicName-CharacteristicWQXGroup.json +++ b/schemas/data/src/lookup/CharacteristicName-CharacteristicWQXGroup.json @@ -34,12 +34,14 @@ "4,6-Dimethyldibenzothiophene": "Organics, Other", "5-Methylchrysene/6-Methylchrysene": "Organics, Other", "5,9-Dimethylchrysene": "Organics, Other", + "6PPD-quinone": "Organics, Other", "7-Methylbenzo[a]pyrene": "Organics, Other", "Absorbance at 280 nm": "Physical", "Absorbance at 370 nm": "Physical", "Acidity": "Physical", "Acridine": "Organics, Other", "Adenosine triphosphate": "Organics, Other", + "Ammonia, un-ionized": "Nutrient", "BDE-003": "Organics, BDEs", "BDE-049": "Organics, BDEs", "BDE-071": "Organics, BDEs", @@ -206,6 +208,7 @@ "Tolfenamic acid": "Organics, Other", "Total xylenes": "Organics, Other", "Toxicity microtox EC50": "Toxicity", + "Transmittance at 254 nm": "Physical", "Trichloroacetic acid": "Organics, Other", "Trinexapac-Ethyl": "Organics, Pesticide", "Uranium-234/Uranium-238 ratio": "Radiochemical", diff --git a/schemas/data/src/lookup/CharacteristicName-Guideline-MeasurementUnit.json b/schemas/data/src/lookup/CharacteristicName-Guideline-MeasurementUnit.json index 1963ee84..f0e07811 100644 --- a/schemas/data/src/lookup/CharacteristicName-Guideline-MeasurementUnit.json +++ b/schemas/data/src/lookup/CharacteristicName-Guideline-MeasurementUnit.json @@ -104,6 +104,7 @@ "Aluminum": ["ug/L"], "Aminoazobenzene": ["ug/L"], "Ammonia": ["mg/L"], + "Ammonia, un-ionized": ["mg/L"], "Ammonia and ammonium": ["mg/L"], "Aniline": ["ug/L"], "Anthracene": ["ug/L", "ug/kg"], diff --git a/schemas/data/src/lookup/CharacteristicName-MeasurementUnit.json b/schemas/data/src/lookup/CharacteristicName-MeasurementUnit.json index afaa6981..bd589abd 100644 --- a/schemas/data/src/lookup/CharacteristicName-MeasurementUnit.json +++ b/schemas/data/src/lookup/CharacteristicName-MeasurementUnit.json @@ -74,6 +74,7 @@ "Aluminum": ["ug/L"], "Aminoazobenzene": ["mg/L"], "Ammonia": ["mg/L"], + "Ammonia, un-ionized": ["mg/L"], "Aniline": ["ug/L"], "Anthracene": ["ug/L"], "Antimony": ["ug/L"], diff --git a/schemas/data/src/lookup/CharacteristicWQXGroup-MeasurementUnit.json b/schemas/data/src/lookup/CharacteristicWQXGroup-MeasurementUnit.json index 4d88d763..3ba8f545 100644 --- a/schemas/data/src/lookup/CharacteristicWQXGroup-MeasurementUnit.json +++ b/schemas/data/src/lookup/CharacteristicWQXGroup-MeasurementUnit.json @@ -106,7 +106,8 @@ "m", "m2", "m3", - "%" + "%", + "%/cm" ], "Physical, Habitat": ["%"], "Phytoplankton, Cyanobacteria, Photosynthetic Pigments": [], diff --git a/schemas/data/src/lookup/MeasurementUnit.json b/schemas/data/src/lookup/MeasurementUnit.json index eac7fa7b..4c6e2f87 100644 --- a/schemas/data/src/lookup/MeasurementUnit.json +++ b/schemas/data/src/lookup/MeasurementUnit.json @@ -1,4 +1,5 @@ { + "%/cm": "Light intensity, Percentage per centimeter", "per mil AIR": "Parts per thousand, compared to the isotope reference standard atmospheric nitrogen gas (AIR)", "per mil VCDT": "Parts per thousand, compared to the isotope reference standard Vienna-Canyon Diablo Troilite (VCDT)", "per mil VPDB": "Parts per thousand, compared to the isotope reference Vienna Pee Dee Belemnite (VPDB)", diff --git a/schemas/data/src/subset/CharacteristicName.json b/schemas/data/src/subset/CharacteristicName.json index 3748d302..34aff7fc 100644 --- a/schemas/data/src/subset/CharacteristicName.json +++ b/schemas/data/src/subset/CharacteristicName.json @@ -167,6 +167,7 @@ "5,9-Dimethylchrysene", "6-Acetyl-1,1,2,4,4,7-hexamethyltetralin", "6:2 Fluorotelomer sulfonate acid", + "6PPD-quinone", "7-Methylbenzo[a]pyrene", "7,12-Dimethylbenz[a]anthracene", "8(14)-Abietenic acid", From e1263eae5d26647211835d7d5e2f73d0908dfacf Mon Sep 17 00:00:00 2001 From: meghanDS Date: Mon, 2 Jun 2025 11:18:12 -0400 Subject: [PATCH 02/20] Moving '%/cm' from 'addition' to 'subset' WQX added '%/cm' as per our request: %/cm (Light intensity, Percentage per centimeter) --- .../data/src/addition/ResultDetectionQuantitationLimitUnit.json | 1 - schemas/data/src/addition/ResultUnit.json | 1 - .../data/src/subset/ResultDetectionQuantitationLimitUnit.json | 1 + schemas/data/src/subset/ResultUnit.json | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/data/src/addition/ResultDetectionQuantitationLimitUnit.json b/schemas/data/src/addition/ResultDetectionQuantitationLimitUnit.json index 5b4e31bc..4719b773 100644 --- a/schemas/data/src/addition/ResultDetectionQuantitationLimitUnit.json +++ b/schemas/data/src/addition/ResultDetectionQuantitationLimitUnit.json @@ -1,5 +1,4 @@ [ - "%/cm", "per mil AIR", "per mil VCDT", "per mil VPDB", diff --git a/schemas/data/src/addition/ResultUnit.json b/schemas/data/src/addition/ResultUnit.json index 5b4e31bc..4719b773 100644 --- a/schemas/data/src/addition/ResultUnit.json +++ b/schemas/data/src/addition/ResultUnit.json @@ -1,5 +1,4 @@ [ - "%/cm", "per mil AIR", "per mil VCDT", "per mil VPDB", diff --git a/schemas/data/src/subset/ResultDetectionQuantitationLimitUnit.json b/schemas/data/src/subset/ResultDetectionQuantitationLimitUnit.json index 7d3147ce..675d518f 100644 --- a/schemas/data/src/subset/ResultDetectionQuantitationLimitUnit.json +++ b/schemas/data/src/subset/ResultDetectionQuantitationLimitUnit.json @@ -7,6 +7,7 @@ "#/sec", "#/mL", "%", + "%/cm", "Bq/L", "CCE/100mL", "CE/100mL", diff --git a/schemas/data/src/subset/ResultUnit.json b/schemas/data/src/subset/ResultUnit.json index 7d3147ce..675d518f 100644 --- a/schemas/data/src/subset/ResultUnit.json +++ b/schemas/data/src/subset/ResultUnit.json @@ -7,6 +7,7 @@ "#/sec", "#/mL", "%", + "%/cm", "Bq/L", "CCE/100mL", "CE/100mL", From 7e7db73f9835f30c6e042c5f31044ebb3d7e8a2a Mon Sep 17 00:00:00 2001 From: meghanDS Date: Mon, 2 Jun 2025 11:24:57 -0400 Subject: [PATCH 03/20] Fixing small spacing issue small indent update after PS's last commit --- schemas/data/src/locales/CharacteristicName.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/data/src/locales/CharacteristicName.json b/schemas/data/src/locales/CharacteristicName.json index e306d80c..1417df98 100644 --- a/schemas/data/src/locales/CharacteristicName.json +++ b/schemas/data/src/locales/CharacteristicName.json @@ -1688,7 +1688,7 @@ "fr": null } }, - "7-Methylbenzo[a]pyrene": { + "7-Methylbenzo[a]pyrene": { "name": { "en": "7-Methylbenzo[a]pyrene", "fr": null From d00503620a787738a5beb357cf3ed10c62b306a9 Mon Sep 17 00:00:00 2001 From: meghanDS Date: Mon, 2 Jun 2025 11:26:52 -0400 Subject: [PATCH 04/20] Small Ammonia, un-ionized typo fix --- .../logic/CharacteristicName-Nutrient-ResultSampleFraction.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/data/src/logic/CharacteristicName-Nutrient-ResultSampleFraction.json b/schemas/data/src/logic/CharacteristicName-Nutrient-ResultSampleFraction.json index 7d4a6cf4..193986d0 100644 --- a/schemas/data/src/logic/CharacteristicName-Nutrient-ResultSampleFraction.json +++ b/schemas/data/src/logic/CharacteristicName-Nutrient-ResultSampleFraction.json @@ -19,7 +19,7 @@ "CharacteristicName": { "enum": [ "Ammonia", - "Ammonia, un-uonized", + "Ammonia, un-ionized", "Ammonia and ammonium", "Ammonium", "Inorganic nitrogen (ammonia, nitrate and nitrite)", From f679c959533797639f08b38396d4873da228c551 Mon Sep 17 00:00:00 2001 From: meghanDS Date: Mon, 2 Jun 2025 11:33:58 -0400 Subject: [PATCH 05/20] Subset Total Volatile Hydrocarbons, C6-C10 Group `"Not Assigned" - override to "Organics, other" --- .../src/lookup/CharacteristicName-CharacteristicWQXGroup.json | 1 + schemas/data/src/subset/CharacteristicName.json | 1 + 2 files changed, 2 insertions(+) diff --git a/schemas/data/src/lookup/CharacteristicName-CharacteristicWQXGroup.json b/schemas/data/src/lookup/CharacteristicName-CharacteristicWQXGroup.json index 1af82934..eaf6d6a5 100644 --- a/schemas/data/src/lookup/CharacteristicName-CharacteristicWQXGroup.json +++ b/schemas/data/src/lookup/CharacteristicName-CharacteristicWQXGroup.json @@ -206,6 +206,7 @@ "Thiram": "Organics, Pesticide", "Thorium": "Inorganics, Minor, Metals", "Tolfenamic acid": "Organics, Other", + "Total Volatile Hydrocarbons, C6-C10": "Organics, Other", "Total xylenes": "Organics, Other", "Toxicity microtox EC50": "Toxicity", "Transmittance at 254 nm": "Physical", diff --git a/schemas/data/src/subset/CharacteristicName.json b/schemas/data/src/subset/CharacteristicName.json index 34aff7fc..76fa26c2 100644 --- a/schemas/data/src/subset/CharacteristicName.json +++ b/schemas/data/src/subset/CharacteristicName.json @@ -1297,6 +1297,7 @@ "Total Phosphorus, mixed forms", "Total solids", "Total suspended solids", + "Total Volatile Hydrocarbons, C6-C10", "Total Volatile Hydrocarbons C6-C10 minus BTEX", "Total volatile solids", "Total xylenes", From 81e2d37c59637faa88bda9358719ca83fd384172 Mon Sep 17 00:00:00 2001 From: meghanDS Date: Mon, 2 Jun 2025 11:52:52 -0400 Subject: [PATCH 06/20] remove USGS addition and change to USDOI/USGS subset --- schemas/data/src/addition/ResultAnalyticalMethodContext.json | 1 - schemas/data/src/locales/ResultAnalyticalMethodContext.json | 4 ++-- schemas/data/src/subset/ResultAnalyticalMethodContext.json | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/data/src/addition/ResultAnalyticalMethodContext.json b/schemas/data/src/addition/ResultAnalyticalMethodContext.json index 41a6543c..a8b143f8 100644 --- a/schemas/data/src/addition/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/addition/ResultAnalyticalMethodContext.json @@ -11,6 +11,5 @@ "Seal", "Solinist", "Turner Designs", - "USGS", "VMV" ] diff --git a/schemas/data/src/locales/ResultAnalyticalMethodContext.json b/schemas/data/src/locales/ResultAnalyticalMethodContext.json index fe119c69..10af323d 100644 --- a/schemas/data/src/locales/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/locales/ResultAnalyticalMethodContext.json @@ -318,9 +318,9 @@ "fr": null } }, - "USGS": { + "USDOI/USGS": { "name": { - "en": "USGS", + "en": "USDOI/USGS", "fr": null }, "description": { diff --git a/schemas/data/src/subset/ResultAnalyticalMethodContext.json b/schemas/data/src/subset/ResultAnalyticalMethodContext.json index 834f2998..07f08766 100644 --- a/schemas/data/src/subset/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/subset/ResultAnalyticalMethodContext.json @@ -25,6 +25,7 @@ "PROPRIETARY", "Seal", "THERMO-SCIENTIFIC", + "USDOI/USGS", "USEPA", "VMV", "YSI" From 23184f3cc866b8cc589d6dd2ef079ea0b2ad7b3b Mon Sep 17 00:00:00 2001 From: meghanDS Date: Mon, 2 Jun 2025 12:33:22 -0400 Subject: [PATCH 07/20] Measurement Unit - moving %/cm from addition to subset --- schemas/data/src/addition/MeasurementUnit.json | 1 - schemas/data/src/subset/MeasurementUnit.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/data/src/addition/MeasurementUnit.json b/schemas/data/src/addition/MeasurementUnit.json index 5b4e31bc..4719b773 100644 --- a/schemas/data/src/addition/MeasurementUnit.json +++ b/schemas/data/src/addition/MeasurementUnit.json @@ -1,5 +1,4 @@ [ - "%/cm", "per mil AIR", "per mil VCDT", "per mil VPDB", diff --git a/schemas/data/src/subset/MeasurementUnit.json b/schemas/data/src/subset/MeasurementUnit.json index 5a448246..d2ab2197 100644 --- a/schemas/data/src/subset/MeasurementUnit.json +++ b/schemas/data/src/subset/MeasurementUnit.json @@ -7,6 +7,7 @@ "#/sec", "#/mL", "%", + "%/cm", "Bq/L", "CCE/100mL", "CE/100mL", From 38fd39680ce4d53aeb39480282601f974e1742d5 Mon Sep 17 00:00:00 2001 From: meghanDS Date: Mon, 2 Jun 2025 15:58:27 -0400 Subject: [PATCH 08/20] Fixing 'Solinst' spelling --- schemas/data/src/addition/ResultAnalyticalMethodContext.json | 2 +- schemas/data/src/locales/ResultAnalyticalMethodContext.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/data/src/addition/ResultAnalyticalMethodContext.json b/schemas/data/src/addition/ResultAnalyticalMethodContext.json index a8b143f8..6d759406 100644 --- a/schemas/data/src/addition/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/addition/ResultAnalyticalMethodContext.json @@ -9,7 +9,7 @@ "PROPRIETARY", "RBR", "Seal", - "Solinist", + "Solinst", "Turner Designs", "VMV" ] diff --git a/schemas/data/src/locales/ResultAnalyticalMethodContext.json b/schemas/data/src/locales/ResultAnalyticalMethodContext.json index 10af323d..79b14205 100644 --- a/schemas/data/src/locales/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/locales/ResultAnalyticalMethodContext.json @@ -278,9 +278,9 @@ "fr": null } }, - "Solinist": { + "Solinst": { "name": { - "en": "Solinist", + "en": "Solinst", "fr": null }, "description": { From 500882996e6a5ef0ed87d701171f8b24e6562807 Mon Sep 17 00:00:00 2001 From: meghanDS Date: Tue, 3 Jun 2025 13:39:01 -0400 Subject: [PATCH 09/20] WQX accepted BC_MOE and APHA_SM24ED contexts Adding '_' to BC_MOE and moving from addition to subset --- schemas/data/src/addition/ResultAnalyticalMethodContext.json | 2 -- schemas/data/src/locales/ResultAnalyticalMethodContext.json | 4 ++-- schemas/data/src/subset/ResultAnalyticalMethodContext.json | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/schemas/data/src/addition/ResultAnalyticalMethodContext.json b/schemas/data/src/addition/ResultAnalyticalMethodContext.json index 6d759406..c2b85c72 100644 --- a/schemas/data/src/addition/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/addition/ResultAnalyticalMethodContext.json @@ -1,6 +1,4 @@ [ - "APHA_SM24ED", - "BC MOE", "DOI", "Hydrolab", "METER Group", diff --git a/schemas/data/src/locales/ResultAnalyticalMethodContext.json b/schemas/data/src/locales/ResultAnalyticalMethodContext.json index 79b14205..747cd26e 100644 --- a/schemas/data/src/locales/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/locales/ResultAnalyticalMethodContext.json @@ -78,9 +78,9 @@ "fr": null } }, - "BC MOE": { + "BC_MOE": { "name": { - "en": "BC MOE", + "en": "BC_MOE", "fr": null }, "description": { diff --git a/schemas/data/src/subset/ResultAnalyticalMethodContext.json b/schemas/data/src/subset/ResultAnalyticalMethodContext.json index 07f08766..cb36a154 100644 --- a/schemas/data/src/subset/ResultAnalyticalMethodContext.json +++ b/schemas/data/src/subset/ResultAnalyticalMethodContext.json @@ -5,7 +5,9 @@ "APHA_SM21ED", "APHA_SM22ED", "APHA_SM23ED", + "APHA_SM24ED", "ASTM", + "BC_MOE", "DIN", "DOI", "EN", From 67bc541a2717afb154cacc103a4d9a5e5a928411 Mon Sep 17 00:00:00 2001 From: meghanDS Date: Tue, 3 Jun 2025 13:45:05 -0400 Subject: [PATCH 10/20] Transmittance at 254 nm added by WQX - moving from addition to subset --- schemas/data/src/addition/CharacteristicName.json | 3 +-- schemas/data/src/subset/CharacteristicName.json | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/data/src/addition/CharacteristicName.json b/schemas/data/src/addition/CharacteristicName.json index 70044ce0..ad43569d 100644 --- a/schemas/data/src/addition/CharacteristicName.json +++ b/schemas/data/src/addition/CharacteristicName.json @@ -15,6 +15,5 @@ "m- & p-Chlorophenol", "Phosphorus, elemental", "p-Chlorophenol", - "Thorium", - "Transmittance at 254 nm" + "Thorium" ] diff --git a/schemas/data/src/subset/CharacteristicName.json b/schemas/data/src/subset/CharacteristicName.json index 76fa26c2..048adb8f 100644 --- a/schemas/data/src/subset/CharacteristicName.json +++ b/schemas/data/src/subset/CharacteristicName.json @@ -1309,6 +1309,7 @@ "trans-1,3-Dichloropropene", "trans-Chlordane", "trans-Nonachlor", + "Transmittance at 254 nm", "Transparency, Secchi tube with disk", "Transparency, tube with disk", "Transpermethrin", From 56ae9f8abee53a7ff22ef1a7bac42c5fe530c86a Mon Sep 17 00:00:00 2001 From: meghanDS Date: Tue, 3 Jun 2025 13:54:08 -0400 Subject: [PATCH 11/20] adding 'Historical' result status ID to subset --- schemas/data/src/locales/ResultStatusID.json | 10 ++++++++++ schemas/data/src/subset/ResultStatusID.json | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/schemas/data/src/locales/ResultStatusID.json b/schemas/data/src/locales/ResultStatusID.json index f3e341bd..0a527285 100644 --- a/schemas/data/src/locales/ResultStatusID.json +++ b/schemas/data/src/locales/ResultStatusID.json @@ -28,6 +28,16 @@ "fr": null } }, + "Historical": { + "name": { + "en": "Historical", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "Preliminary": { "name": { "en": "Preliminary", diff --git a/schemas/data/src/subset/ResultStatusID.json b/schemas/data/src/subset/ResultStatusID.json index f84ab104..65b040d5 100644 --- a/schemas/data/src/subset/ResultStatusID.json +++ b/schemas/data/src/subset/ResultStatusID.json @@ -1 +1,9 @@ -["Accepted", "Final", "Preliminary", "Rejected", "Validated", "Provisional"] +[ +"Accepted", +"Final", +"Historical", +"Preliminary", +"Rejected", +"Validated", +"Provisional" +] From 3cae6cc80fb9de17f5474a895bd25a470d8f8900 Mon Sep 17 00:00:00 2001 From: meghanDS Date: Tue, 3 Jun 2025 14:11:07 -0400 Subject: [PATCH 12/20] WQX added Beta sampler - moving to subset --- schemas/data/src/addition/SampleCollectionEquipmentName.json | 3 --- schemas/data/src/locales/SampleCollectionEquipmentName.json | 4 ++-- schemas/data/src/subset/SampleCollectionEquipmentName.json | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/schemas/data/src/addition/SampleCollectionEquipmentName.json b/schemas/data/src/addition/SampleCollectionEquipmentName.json index 3cf1d815..e69de29b 100644 --- a/schemas/data/src/addition/SampleCollectionEquipmentName.json +++ b/schemas/data/src/addition/SampleCollectionEquipmentName.json @@ -1,3 +0,0 @@ -[ - "Beta Sampler" -] diff --git a/schemas/data/src/locales/SampleCollectionEquipmentName.json b/schemas/data/src/locales/SampleCollectionEquipmentName.json index 88aac940..45605fef 100644 --- a/schemas/data/src/locales/SampleCollectionEquipmentName.json +++ b/schemas/data/src/locales/SampleCollectionEquipmentName.json @@ -18,9 +18,9 @@ "fr": null } }, - "Beta Sampler": { + "Beta sampler": { "name": { - "en": "Beta Sampler", + "en": "Beta sampler", "fr": null }, "description": { diff --git a/schemas/data/src/subset/SampleCollectionEquipmentName.json b/schemas/data/src/subset/SampleCollectionEquipmentName.json index f66a593b..68a33aef 100644 --- a/schemas/data/src/subset/SampleCollectionEquipmentName.json +++ b/schemas/data/src/subset/SampleCollectionEquipmentName.json @@ -1,4 +1,5 @@ [ + "Beta sampler", "Bucket", "DH-81", "DH-95", From 73e34547e8104aaf0458c36272058dc839c76f3d Mon Sep 17 00:00:00 2001 From: meghanDS Date: Tue, 3 Jun 2025 14:59:00 -0400 Subject: [PATCH 13/20] Adding Total Volatile Hydrocarbons, C6-C10 to locales --- schemas/data/src/locales/CharacteristicName.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/schemas/data/src/locales/CharacteristicName.json b/schemas/data/src/locales/CharacteristicName.json index 1417df98..6b16056d 100644 --- a/schemas/data/src/locales/CharacteristicName.json +++ b/schemas/data/src/locales/CharacteristicName.json @@ -12838,6 +12838,16 @@ "fr": null } }, + "Total Volatile Hydrocarbons, C6-C10": { + "name": { + "en": "Total Volatile Hydrocarbons, C6-C10", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "Total Volatile Hydrocarbons C6-C10 minus BTEX": { "name": { "en": "Total Volatile Hydrocarbons C6-C10 minus BTEX", From 5f3c8ac716d8770b7079aec15fbfebfbf4120d37 Mon Sep 17 00:00:00 2001 From: meghanDS Date: Tue, 3 Jun 2025 15:09:42 -0400 Subject: [PATCH 14/20] WQX added 27 new activity types, we are ignoring 23 and accepting 4 --- schemas/data/src/locales/ActivityType.json | 40 +++++++++++++++++++ .../data/src/subtraction/ActivityType.json | 23 +++++++++++ 2 files changed, 63 insertions(+) diff --git a/schemas/data/src/locales/ActivityType.json b/schemas/data/src/locales/ActivityType.json index 4fd6620c..78f7306e 100644 --- a/schemas/data/src/locales/ActivityType.json +++ b/schemas/data/src/locales/ActivityType.json @@ -158,6 +158,46 @@ "fr": null } }, + "Quality Control Sample-Integrated Time Series-Field Blank": { + "name": { + "en": "Quality Control Sample-Integrated Time Series-Field Blank", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, + "Quality Control Sample-Integrated Time Series-Lab Blank": { + "name": { + "en": "Quality Control Sample-Integrated Time Series-Lab Blank", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, + "Quality Control Sample-Integrated Time Series-Trip Blank": { + "name": { + "en": "Quality Control Sample-Integrated Time Series-Trip Blank", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, + "Quality Control Sample-Integrated Time Series-Unspecified Blank": { + "name": { + "en": "Quality Control Sample-Integrated Time Series-Unspecified Blank", + "fr": null + }, + "description": { + "en": null, + "fr": null + } + }, "Quality Control Sample-Inter-lab Split": { "name": { "en": "Quality Control Sample-Inter-lab Split", diff --git a/schemas/data/src/subtraction/ActivityType.json b/schemas/data/src/subtraction/ActivityType.json index b08e7027..1fd39830 100644 --- a/schemas/data/src/subtraction/ActivityType.json +++ b/schemas/data/src/subtraction/ActivityType.json @@ -7,8 +7,17 @@ "Quality Control Field Replicate Sample-Composite", "Quality Control Field Replicate Sample-Field Subsample", "Quality Control Lab Sample Equipment Rinsate Blank", + "Quality Control Sample-Archive Blank", + "Quality Control Sample-Concurrent Replicate", "Quality Control Sample-Equipment Blank", "Quality Control Sample-Field Ambient Conditions Blank", + "Quality Control Sample-Integrated Time Series-Ambient Blank", + "Quality Control Sample-Integrated Time Series-Concurrent Replicate", + "Quality Control Sample-Integrated Time Series-Sequential Replicate", + "Quality Control Sample-Integrated Time Series-Split Replicate", + "Quality Control Sample-Integrated Time Series-SplitConcurrentReplicate", + "Quality Control Sample-Integrated Time Series-SplitSequentialReplicate", + "Quality Control Sample-Integrated Time Series-Unspecified Replicate", "Quality Control Sample-Lab Continuing Calibration Verification", "Quality Control Sample-Lab Control Sample/Blank Spike", "Quality Control Sample-Lab Control Sample/Blank Spike Duplicate", @@ -20,5 +29,19 @@ "Quality Control Sample-Lab Spike Duplicate", "Quality Control Sample-Lab Spike of a Lab Blank", "Quality Control Sample-Lab Surrogate Method Blank", + "Quality Control Sample-Reference Material", + "Quality Control Sample-Sequential Replicate", + "Quality Control Sample-Source Solution Blank", + "Quality Control Sample-Spike Replicate", + "Quality Control Sample-Spike, Unspecified Type", + "Quality Control Sample-Split Concurrent Replicate", + "Quality Control Sample-Split Replicate", + "Quality Control Sample-Split Sequential Replicate", + "Quality Control Sample-Topical Replicate", + "Quality Control Sample-Topical Spike", + "Quality Control Sample-Unspecified Blank", + "Quality Control Sample-Unspecified Replicate", + "Quality Control Sample-Unspecified Topical", + "Sample-Integrated Unspecified Profile", "Sample-Routine Resample" ] From b2502f1a842d7112b4209a038e987f932cd0998c Mon Sep 17 00:00:00 2001 From: Patrick Schaefer Date: Wed, 4 Jun 2025 11:12:47 -0400 Subject: [PATCH 15/20] Alphabetized ResultStatusID --- schemas/data/src/subset/ResultStatusID.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/data/src/subset/ResultStatusID.json b/schemas/data/src/subset/ResultStatusID.json index 65b040d5..da5c47a0 100644 --- a/schemas/data/src/subset/ResultStatusID.json +++ b/schemas/data/src/subset/ResultStatusID.json @@ -3,7 +3,7 @@ "Final", "Historical", "Preliminary", +"Provisional", "Rejected", -"Validated", -"Provisional" +"Validated" ] From ad91d3da899e58567d976c95fa25e96a5e44f2dd Mon Sep 17 00:00:00 2001 From: Patrick Schaefer Date: Wed, 4 Jun 2025 11:15:14 -0400 Subject: [PATCH 16/20] Fixed CharacteristicName indentation --- schemas/data/src/locales/CharacteristicName.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/data/src/locales/CharacteristicName.json b/schemas/data/src/locales/CharacteristicName.json index 6b16056d..b3131120 100644 --- a/schemas/data/src/locales/CharacteristicName.json +++ b/schemas/data/src/locales/CharacteristicName.json @@ -1688,7 +1688,7 @@ "fr": null } }, - "7-Methylbenzo[a]pyrene": { + "7-Methylbenzo[a]pyrene": { "name": { "en": "7-Methylbenzo[a]pyrene", "fr": null @@ -13649,4 +13649,4 @@ } } } -} \ No newline at end of file +} From 7b763507e62377f8d3dc5b7006f088081907b648 Mon Sep 17 00:00:00 2001 From: Patrick Schaefer Date: Wed, 4 Jun 2025 11:16:46 -0400 Subject: [PATCH 17/20] Delete addition/SampleCollectionEquipmentName.json File no not needed --- schemas/data/src/addition/SampleCollectionEquipmentName.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 schemas/data/src/addition/SampleCollectionEquipmentName.json diff --git a/schemas/data/src/addition/SampleCollectionEquipmentName.json b/schemas/data/src/addition/SampleCollectionEquipmentName.json deleted file mode 100644 index e69de29b..00000000 From edabc27751f00d6656083edf953a069b57ba5157 Mon Sep 17 00:00:00 2001 From: Patrick Schaefer Date: Wed, 4 Jun 2025 11:18:49 -0400 Subject: [PATCH 18/20] Added new line at end of ActivityType --- schemas/data/src/locales/ActivityType.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/data/src/locales/ActivityType.json b/schemas/data/src/locales/ActivityType.json index 78f7306e..0de659ad 100644 --- a/schemas/data/src/locales/ActivityType.json +++ b/schemas/data/src/locales/ActivityType.json @@ -599,4 +599,4 @@ } } } -} \ No newline at end of file +} From f55f1fb589fecc0614656ea11de26f90d9bcefa4 Mon Sep 17 00:00:00 2001 From: Patrick Schaefer Date: Wed, 4 Jun 2025 11:19:35 -0400 Subject: [PATCH 19/20] Added new line at end of ActivityGroupType --- schemas/data/src/locales/ActivityGroupType.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/data/src/locales/ActivityGroupType.json b/schemas/data/src/locales/ActivityGroupType.json index 0246c0de..f6833733 100644 --- a/schemas/data/src/locales/ActivityGroupType.json +++ b/schemas/data/src/locales/ActivityGroupType.json @@ -79,4 +79,4 @@ } } } -} \ No newline at end of file +} From bdc9b8bf4575fb5380e0180466681cde937f3598 Mon Sep 17 00:00:00 2001 From: Patrick Schaefer Date: Wed, 4 Jun 2025 11:24:27 -0400 Subject: [PATCH 20/20] Added Ammonia, un-ionized to CharacteristicName-MethodSpeciation --- .../data/src/logic/CharacteristicName-MethodSpeciation.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/schemas/data/src/logic/CharacteristicName-MethodSpeciation.json b/schemas/data/src/logic/CharacteristicName-MethodSpeciation.json index 7a2148ca..a3656ae4 100644 --- a/schemas/data/src/logic/CharacteristicName-MethodSpeciation.json +++ b/schemas/data/src/logic/CharacteristicName-MethodSpeciation.json @@ -11,6 +11,7 @@ "CharacteristicName": { "enum": [ "Ammonia", + "Ammonia, un-ionized", "Ammonia and ammonium", "Ammonium", "Carbon-13", @@ -59,4 +60,4 @@ "MethodSpeciation" ] } -} \ No newline at end of file +}