Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion client/public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,17 @@
},
"spoolSelect": {
"title": "Select Spools",
"description": "Select spools to print labels for.",
"description": "Search for and select spool labels to print:",
"searchPlaceholder": "Search by spool ID, filament, material, location, or lot number",
"showArchived": "Show Archived",
"noSpoolsSelected": "You have not selected any spools.",
"selectAll": "Select/Unselect All",
"selectedTotal_one": "{{count}} spool selected",
"selectedTotal_other": "{{count}} spools selected"
},
"filamentSelect": {
"description": "Search for and select filament labels to print:",
"searchPlaceholder": "Search by filament ID, vendor, name, material, or color"
}
},
"scanner": {
Expand Down
7 changes: 5 additions & 2 deletions client/src/pages/printing/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,14 @@ export const Printing = () => {
{step === 0 && (
<SpoolSelectModal
description={t("printing.spoolSelect.description")}
onContinue={(spools) => {
searchPlaceholder={t("printing.spoolSelect.searchPlaceholder")}
onPrint={(selectedIds) => {
setSearchParams((prev) => {
const newParams = new URLSearchParams(prev);
newParams.delete("spools");
spools.forEach((spool) => newParams.append("spools", spool.id.toString()));
selectedIds.forEach((id) => newParams.append("spools", id.toString()));
// Keep the selector route as the explicit return target so back/cancel
// returns to the selection step instead of the originating show page.
newParams.set("return", "/spool/print");
return newParams;
});
Expand Down
Loading