tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Client: Added custom paper sizes

Browse Source 
Resolves #67
This commit is contained in:
Donkie
2023-08-13 09:57:53 +02:00
parent 8767e3951a
commit 8b048d30b2
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/public/locales/en/common.json
View File

@@ -63,6 +63,8 @@
"columns": "Columns", "columns": "Columns",
"rows": "Rows", "rows": "Rows",
"paperSize": "Paper Size", "paperSize": "Paper Size",
"customSize": "Custom",
"dimensions": "Dimensions",
"showBorder": "Show Border", "showBorder": "Show Border",
"previewScale": "Preview Scale", "previewScale": "Preview Scale",
"skipItems": "Skip Items", "skipItems": "Skip Items",

2
client/public/locales/sv/common.json
View File

@@ -63,6 +63,8 @@
"columns": "Kolumner", "columns": "Kolumner",
"rows": "Rader", "rows": "Rader",
"paperSize": "Papperstyp", "paperSize": "Papperstyp",
"customSize": "Anpassad",
"dimensions": "Dimensioner",
"showBorder": "Visa ram", "showBorder": "Visa ram",
"previewScale": "Skala förhandsgranskning", "previewScale": "Skala förhandsgranskning",
"skipItems": "Hoppa över objekt", "skipItems": "Hoppa över objekt",

30
client/src/components/printing/printingDialog.tsx
View File

@@ -76,11 +76,13 @@ const PrintingDialog: React.FC<PrintingDialogProps> = ({ items, style, extraSett
const [paperRows, setPaperRows] = useSavedState("print-rowsPerPage", 8); const [paperRows, setPaperRows] = useSavedState("print-rowsPerPage", 8);
const [skipItems, setSkipItems] = useSavedState("print-skipItems", 0); const [skipItems, setSkipItems] = useSavedState("print-skipItems", 0);
const [paperSize, setPaperSize] = useSavedState("print-paperSize", "A4"); const [paperSize, setPaperSize] = useSavedState("print-paperSize", "A4");
const [customPaperWidth, setCustomPaperWidth] = useSavedState("print-customPaperWidth", 210);
const [customPaperHeight, setCustomPaperHeight] = useSavedState("print-customPaperHeight", 297);
const [previewScale, setPreviewScale] = useSavedState("print-previewScale", 0.6); const [previewScale, setPreviewScale] = useSavedState("print-previewScale", 0.6);
const [borderShowMode, setBorderShowMode] = useSavedState<"none" | "border" | "grid">("print-borderShowMode", "grid"); const [borderShowMode, setBorderShowMode] = useSavedState<"none" | "border" | "grid">("print-borderShowMode", "grid");
const paperWidth = paperDimensions[paperSize].width; const paperWidth = paperSize === "custom" ? customPaperWidth : paperDimensions[paperSize].width;
const paperHeight = paperDimensions[paperSize].height; const paperHeight = paperSize === "custom" ? customPaperHeight : paperDimensions[paperSize].height;
const printRef = useRef<HTMLDivElement>(null); const printRef = useRef<HTMLDivElement>(null);
@@ -337,8 +339,32 @@ const PrintingDialog: React.FC<PrintingDialogProps> = ({ items, style, extraSett
{key} {key}
</Select.Option> </Select.Option>
))} ))}
<Select.Option value="custom">{t("printing.generic.customSize")}</Select.Option>
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item label={t("printing.generic.dimensions")} hidden={paperSize !== "custom"}>
<Row align="middle">
<Col span={11}>
<InputNumber
value={customPaperWidth}
min={0.1}
addonAfter="mm"
onChange={(value) => setCustomPaperWidth(value ?? 0)}
/>
</Col>
<Col span={2} style={{ textAlign: "center" }}>
x
</Col>
<Col span={11}>
<InputNumber
value={customPaperHeight}
min={0.1}
addonAfter="mm"
onChange={(value) => setCustomPaperHeight(value ?? 0)}
/>
</Col>
</Row>
</Form.Item>
<Form.Item label={t("printing.generic.columns")}> <Form.Item label={t("printing.generic.columns")}>
<Row> <Row>
<Col span={12}> <Col span={12}>