Skip to content

Fast forward deploy. #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampottinger merged 10 commits into from
Apr 25, 2025
Merged

Fast forward deploy. #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
396b1a8
Add packaging consumption as goal.
sampottinger Sep 8, 2024
749e456
Touch up on #421.
sampottinger Sep 8, 2024
8db178b
Lint fix.
sampottinger Sep 9, 2024
eedc981
Merge branch 'expand-mc-sup' into add-packaging-goal
sampottinger Sep 9, 2024
a8ae79b
Clarify that start of life is goods on details tab.
sampottinger Apr 25, 2025
d37650a
Bump cache.
sampottinger Apr 25, 2025
44576f7
Merge pull request #431 from SchmidtDSE/clarify-goods-details
sampottinger Apr 25, 2025
63984ee
Merge pull request #421 from SchmidtDSE/add-packaging-goal
sampottinger Apr 25, 2025
f286383
Revert "Add packaging consumption as goal."
sampottinger Apr 25, 2025
7045cdb
Merge pull request #432 from SchmidtDSE/revert-421-add-packaging-goal
sampottinger Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/report_stage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ class StagePresenter {
} else if (labelRaw === "Net Export (Waste)" && isGlobal) {
return "Waste Trade";
} else if (isGlobal) {
return labelRaw.replace(" (Dom)", "");
return labelRaw.replace(" (Dom ", " (");
} else {
return labelRaw;
}
Expand Down
4 changes: 2 additions & 2 deletions js/strings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ STRINGS.set("netImportsMT", "Net Import (Good/Mat)");
STRINGS.set("netExportsMT", "Net Export (Good/Mat)");
STRINGS.set("netWasteImportMT", "Net Import (Waste)");
STRINGS.set("netWasteExportMT", "Net Export (Waste)");
STRINGS.set("primaryProductionMT", "Virgin (Dom)");
STRINGS.set("secondaryProductionMT", "Second (Dom)");
STRINGS.set("primaryProductionMT", "Virgin (Dom Goods)");
STRINGS.set("secondaryProductionMT", "Second (Dom Goods)");
STRINGS.set("ghg", "GHG");

STRINGS.set(DISPLAY_TYPES.amount, "Annual Million Metric Tons");
Expand Down
2 changes: 1 addition & 1 deletion js/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20240910
20250425
3 changes: 2 additions & 1 deletion service_worker_v2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ const OLD_CACHES = [
"GlobalPlasticsTool_20240907",
"GlobalPlasticsTool_20240908",
"GlobalPlasticsTool_20240909",
"GlobalPlasticsTool_20240910"
];
const CACHE_NAME = "GlobalPlasticsTool_20240910";
const CACHE_NAME = "GlobalPlasticsTool_20250425";
const ESSENTIAL_FILES = [
"/css/README.md",
"/css/base.css",
Expand Down
2 changes: 1 addition & 1 deletion template/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@ <h2>Table of Contents</h2>
<a class="tab-trigger" href="#about-privacy">Privacy</a> / <a class="tab-trigger" href="#about-license">Terms</a> / <a class="tab-trigger" href="https://github.com/SchmidtDSE/plastics-prototype">Open Source</a> / <a class="tab-trigger" href="#about-contact">Contact</a> / <a class="tab-trigger" href="#toc">Table of Contents</a> / <a class="tab-trigger" href="#settings">Accessibility</a> / <a class="tab-trigger" href="#about-publication">Cite Us</a>
</footer>

<input type="hidden" id="version-number" value="20240910">
<input type="hidden" id="version-number" value="20250425">

<dialog id="add-dialog">
<form>
Expand Down