Merge pull request #3405 from DOI-ONRR/May-24-Data-Uploads

May-24-Data-Uploads
DOI-ONRR · May 15, 2024 · 1ee685c · 1ee685c
2 parents 66b9ef3 + 688778b
commit 1ee685c
Show file tree

Hide file tree

Showing 23 changed files with 493,660 additions and 487,112 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -207,6 +207,10 @@ jobs:
       - run:
           command: |
             ls -lart static/downloads
+      - run:
+          name: Overwrite robots.txt
+          command: |
+            cp ./static/robots-dev.txt ./static/robots.txt
       - run:
           name: Build gatsby
           command: export GATSBY_HASURA_URI=https://hasura-sandbox.app.cloud.gov/v1/graphql &&  export CIRCLE_STAGE='nrrd-preview' && npm run build
@@ -242,7 +246,6 @@ jobs:
           name: "list generated downloads"
           command: |
             ls -lart static/downloads
-           # rm static/downloads/downloads.json
       - aws-s3/sync:
           arguments: |
           aws-access-key-id: NPS_AWS_ACCESS_KEY
@@ -255,6 +258,10 @@ jobs:
           command: |
             ls -lart static/downloads
             cat static/downloads/downloads.json
+      - run:
+          name: Overwrite robots.txt
+          command: |
+            cp ./static/robots-dev.txt ./static/robots.txt
       - run:
           name: Build gatsby
           command: export GATSBY_HASURA_URI=https://hasura-dev.app.cloud.gov/v1/graphql && npm run build

diff --git a/database/changelog/changelog-data/disbursement.yaml b/database/changelog/changelog-data/disbursement.yaml
@@ -1,6 +1,6 @@
 databaseChangeLog:
   - changeSet:
-      id: disbursement-monthly-24-March
+      id: disbursement-monthly-24-April
       author: Lindsay Goldstein
       changes:
       - sql:

diff --git a/database/changelog/changelog-data/production-calendar-year.yaml b/database/changelog/changelog-data/production-calendar-year.yaml
@@ -6,7 +6,7 @@ databaseChangeLog:
       - sql:
           dbms: 'postgresql'
           sql: |
-            TRUNCATE TABLE fiscal_year_production_elt
+            TRUNCATE TABLE calendar_year_production_elt
       - loadData:
           tableName: calendar_year_production_elt
           file: '../static/csv/production/calendar_year_production.csv'

diff --git a/database/changelog/changelog-data/production-monthly.yaml b/database/changelog/changelog-data/production-monthly.yaml
@@ -1,6 +1,6 @@
 databaseChangeLog:
   - changeSet:
-      id: production-monthly-23-December
+      id: production-monthly-24-january
       author: Christine Thomas
       changes: 
       - sql:

diff --git a/database/changelog/changelog-data/revenue.yaml b/database/changelog/changelog-data/revenue.yaml
@@ -1,6 +1,6 @@
 databaseChangeLog:
   - changeSet:
-      id: revenue-24-mar
+      id: revenue-24-mapr
       author: Christine Thomas
       changes: 
       - sql:
@@ -9,7 +9,7 @@ databaseChangeLog:
             TRUNCATE TABLE monthly_revenue_elt
       - loadData:
           tableName: monthly_revenue_elt
-          file: '../static/csv/revenue/March 2024 Revenue for Portal_csv.csv'
+          file: '../static/csv/revenue/April 2024 Revenue for Portal_csv.csv'
           quotchar: '""'
           columns:
           - column:

diff --git a/database/changelog/changelog-functions/production-cy-refactor-functions.yaml b/database/changelog/changelog-functions/production-cy-refactor-functions.yaml
@@ -2,6 +2,7 @@ databaseChangeLog:
   - changeSet:
       id: refactor-production-cy-functions
       author: Jeff Schwartz
+      runOnChange: true
       changes:
       - sqlFile:
           path: src/functions/ignore_empty_production_cy.sql

diff --git a/database/changelog/changelog-root.yaml b/database/changelog/changelog-root.yaml
@@ -15,6 +15,8 @@ databaseChangeLog:
         file: changelog-data/production-monthly.yaml
     - include:
         file: changelog-data/production-fiscal-year.yaml
+    - include:
+        file: changelog-data/production-calendar-year.yaml
     - include:
         file: changelog-data/disbursement.yaml
     - include:

diff --git a/database/changelog/src/functions/transform_product.sql b/database/changelog/src/functions/transform_product.sql
@@ -11,6 +11,8 @@ BEGIN
             NEW.product := 'Geothermal - Direct Use (Hundreds of Gallons)';
         WHEN NEW.product = 'Geothermal - Direct Use, Millions of Gallons' THEN
             NEW.product := 'Geothermal - Direct Use (Millions of Gallons)';
+        WHEN NEW.product = 'Geothermal - Direct Use, Millions of Gallons (cgal)' THEN
+            NEW.product := 'Geothermal - Direct Use, Millions of Gallons (mgal)';
         WHEN NEW.product = 'Geothermal - Direct Utilization, Millions of BTUs' THEN
             NEW.product := 'Geothermal - Direct Use (Millions of BTUs)';
         WHEN NEW.product = 'Geothermal - Electrical Generation, Kilowatt Hours' THEN

diff --git a/database/static/csv/disbursements/monthly_disbursements.csv b/database/static/csv/disbursements/monthly_disbursements.csv
diff --git a/database/static/csv/production/calendar_year_production.csv b/database/static/csv/production/calendar_year_production.csv
diff --git a/database/static/csv/production/monthly_production.csv b/database/static/csv/production/monthly_production.csv
diff --git a/database/static/csv/revenue/April 2024 Revenue for Portal_csv.csv b/database/static/csv/revenue/April 2024 Revenue for Portal_csv.csv
diff --git a/src/components/content-partials/Footer.mdx b/src/components/content-partials/Footer.mdx
@@ -24,7 +24,7 @@ site on <Link href='https://blog-nrrd.doi.gov' style={{ color: 'white' }}>our te
             <Link href='https://www.doi.gov/foia' style={{ color: 'white' }}>FOIA <OpenInNewIcon style={{ fontSize: 12, fill: 'white' }} /></Link>&nbsp;|&nbsp;
             <Link href='https://www.usa.gov/' style={{ color: 'white' }}>USA.gov <OpenInNewIcon style={{ fontSize: 12, fill: 'white' }} /></Link>&nbsp;|&nbsp;
             <Link href='https://www.doioig.gov/' style={{ color: 'white' }}>Inspector General <OpenInNewIcon style={{ fontSize: 12, fill: 'white' }} /></Link>&nbsp;|&nbsp;
-            <Link href='/fact-sheet' style={{ color: 'white' }}>Monthly Fact Sheet</Link>&nbsp;|&nbsp;
+            <Link href='https://www.doi.gov/pmb/eeo/reports-repository' style={{ color: 'white' }}>No Fear Act <OpenInNewIcon style={{ fontSize: 12, fill: 'white' }} /></Link>&nbsp;|&nbsp;
             <Link href='/vdp' style={{ color: 'white' }}>Vulnerability Disclosure Policy</Link>&nbsp;|&nbsp;
             <Link href='/information-quality' style={{ color: 'white' }}>Information Quality</Link>&nbsp;|&nbsp;
             <Link href='/accessibility' style={{ color: 'white' }}>Accessibility</Link>&nbsp;|&nbsp;

diff --git a/src/pages/downloads/production-by-disposition.mdx b/src/pages/downloads/production-by-disposition.mdx
@@ -26,7 +26,7 @@ import OpenInNewIcon from '@material-ui/icons/OpenInNew'
 This dataset contains monthly production disposition volumes from ONRR’s OGOR-B form. These volumes come from the production of oil and gas. Production locations include federal lands, federal waters, and Native American lands.
 <br />
 
-This data is available from January 2003 through the most recently available month, which is usually 3-4 months prior to the current month. The historical dataset contains data from January 2003 through December 2012 and is not updated. The dataset starting with January 2013 is updated monthly.
+This data is available from January 2003 through the most recently available month, which is usually 3-4 months prior to the current month. The historical dataset contains data from January 2003 through December 2013 and is not updated. The dataset starting with January 2014 is updated monthly.
 <br />
 
 This dataset contains monthly information on the disposition of production for each product (oil and gas) produced. The product could have been:
@@ -40,21 +40,21 @@ This dataset contains monthly information on the disposition of production for e
 Download production disposition data by month:
 
 <Link linkType="DownloadCsv" href="/downloads/OGOR-B/OGORBcsv.csv">
-  Production Disposition Volumes, January 2013 - December 2023
+  Production Disposition Volumes, January 2014 - January 2024
 </Link>
 
 <Link linkType="DownloadXls" href="/downloads/OGOR-B/OGORB.xlsx">
-  Production Disposition Volumes, January 2013 - December 2023
+  Production Disposition Volumes, January 2014 - January 2024
 </Link>
 
 ## Download historical production disposition data by month:
 
 <Link linkType="DownloadCsv" href="/downloads/OGOR-B/Historical_OGORBcsv_CY2003-2012.csv">
-  Historical Production Disposition Volumes, January 2003 - December 2012
+  Historical Production Disposition Volumes, January 2003 - December 2013
 </Link>
 
 <Link linkType="DownloadXls" href="/downloads/OGOR-B/Historical_OGORB_CY2003-2012.xlsx">
-  Historical Production Disposition Volumes, January 2003 - December 2012
+  Historical Production Disposition Volumes, January 2003 - December 2013
 </Link>
 
 ## Scope

diff --git a/src/pages/how-revenue-works/native-american-ownership-governance.mdx b/src/pages/how-revenue-works/native-american-ownership-governance.mdx
@@ -32,7 +32,7 @@ Today, there are two major types of Native American land:
 - <GlossaryTerm>Trust land</GlossaryTerm>, in which the federal government holds legal title, but the beneficial interest remains with the individual or tribe. Trust lands held on behalf of individuals are known as allotments.
 - Fee land purchased by tribes, in which the tribe acquires legal title under specific statutory authority.
 
-In general, most Native American lands are <GlossaryTerm>trust land</GlossaryTerm>. Approximately 56 million acres of land are held in trust by the United States for various Native American tribes and individuals. View [BIA's FAQs on federal Indian reservations <OpenInNewIcon style={{ fontSize: 20 }} />](https://www.bia.gov/frequently-asked-questions#:~:text=Approximately%2056.2%20million%20acres%20are,%2C%20communities%2C%20etc) to learn more.
+In general, most Native American lands are <GlossaryTerm>trust land</GlossaryTerm>. Approximately 56 million acres of land are held in trust by the United States for various Native American tribes and individuals. View [BIA's definition of a federal Indian reservation <OpenInNewIcon style={{ fontSize: 20 }} />](https://www.bia.gov/faqs/what-federal-indian-reservation) to learn more.
 
 ## Natural resource ownership
 

diff --git a/src/pages/plain-language.mdx b/src/pages/plain-language.mdx
@@ -70,5 +70,4 @@ The Plain Writing Act requires agencies to train their staff in plain language
 For additional training, we recommend: 
 
 - [Online training from plainlanguage.gov <OpenInNewIcon style={{ fontSize: 20 }} />.](https://www.plainlanguage.gov/training/online-training/) This page provides links to plain language training resources, including workshops and toolkits. 
-- [Train-the-trainer bootcamp <OpenInNewIcon style={{ fontSize: 20 }} />](https://www.plainlanguage.gov/training/train-the-trainer-bootcamp/), which trains federal employees on how to conduct plain language classes for government agencies. 
 - [Training videos (YouTube) <OpenInNewIcon style={{ fontSize: 20 }} />](https://www.youtube.com/playlist?list=PLd9b-GuOJ3nHMlmPFMw8cJxN_DW-odj0J) from the Plain Language Action and Information Network (PLAIN).
diff --git a/.../OGOR-B/Historical_OGORB_CY2003-2012.xlsx → .../OGOR-B/Historical_OGORB_CY2003-2013.xlsx b/.../OGOR-B/Historical_OGORB_CY2003-2012.xlsx → .../OGOR-B/Historical_OGORB_CY2003-2013.xlsx