Merge pull request #240 from vsimakhin/fix/extended-format

fix a bug with extended pdf export
vsimakhin · Jun 25, 2024 · 71f7cdb · 71f7cdb
2 parents 5f1d5ab + 9651d6e
commit 71f7cdb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 
+- Fix: Bug with columns for the extended PDF format, both A4 and A5.
 - Update: Update golang to 1.21.11 and golang packages
 - Fix: The daterange picker on the main Logbook page didn't recognize the settings for the first day of the week (Monday or Sunday)
 

diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ You also can easily export all flight records into EASA style pdf format, print
 
 ## [Unreleased]
 
+- Fix: Bug with columns for the extended PDF format, both A4 and A5.
 - Update: Update golang to 1.21.11 and golang packages
 - Fix: The daterange picker on the main Logbook page didn't recognize the settings for the first day of the week (Monday or Sunday)
 

diff --git a/internal/pdfexport/pdfexport.go b/internal/pdfexport/pdfexport.go
@@ -243,6 +243,20 @@ func (p *PDFExporter) initColumns() {
 			c.Col23, //remarks
 		},
 	}
+
+	// extended format add Date column to the FSTD session by reducing Remarks
+	if p.Export.IsExtended {
+		p.columns.w1[10] += c.Col1
+		p.columns.w1[11] -= c.Col1
+
+		p.columns.w2[11] += c.Col1
+		p.columns.w2[12] -= c.Col1
+
+		p.columns.w3[22] -= c.Col1
+
+		p.columns.w4[15] += c.Col1
+		p.columns.w4[17] -= c.Col1
+	}
 }
 
 // initPDF initializes the PDF object