Merge pull request #144 from vsimakhin/fix/long-comments-for-a4-export

Fix/long comments for a4 export
vsimakhin · Jul 1, 2023 · b45aa9b · b45aa9b
2 parents 21f5c66 + c45f0bf
commit b45aa9b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [Unreleased]
+
+- Fix: set smaller font size or even truncate the remarks for PDF exports in case they are too long
+
 ## [2.22.0]
 
 - New: Dark mode.

diff --git a/internal/pdfexport/pdfexport.go b/internal/pdfexport/pdfexport.go
@@ -218,6 +218,31 @@ func formatLandings(landing int) string {
 	}
 }
 
+func printBodyRemarksCell(w float64, value string, fill bool) {
+
+	wFactored := int(w * 0.9)
+	vL := len(value)
+	longCut := int(1.75 * float64(wFactored))
+
+	if vL > longCut {
+		// too long remark, cut it and set font 5
+		pdf.SetFont(fontRegular, "", 5)
+		value = value[:longCut-3] + "..."
+
+	} else if vL > wFactored*3/2 {
+		// slightly long remark
+		pdf.SetFont(fontRegular, "", 5)
+
+	} else if vL > wFactored {
+		// long remark
+		pdf.SetFont(fontRegular, "", 6)
+
+	}
+
+	pdf.CellFormat(w, bodyRowHeight, value, "1", 0, "L", fill, 0, "")
+	pdf.SetFont(fontRegular, "", 8)
+}
+
 func isFillLine(rowCounter int, fill int) bool {
 	if (rowCounter)%fill == 0 { // fill every "fill" row only
 		return true

diff --git a/internal/pdfexport/pdfexport_a4.go b/internal/pdfexport/pdfexport_a4.go
@@ -120,7 +120,7 @@ func printA4LogbookBody(record models.FlightRecord, fill bool) {
 	printBodyTimeCell(w3[19], record.Time.Instructor, fill)
 	printBodyTimeCell(w3[20], record.SIM.Type, fill)
 	printBodyTimeCell(w3[21], record.SIM.Time, fill)
-	printBodyTextCell(w3[22], record.Remarks, fill)
+	printBodyRemarksCell(w3[22], record.Remarks, fill)
 
 	pdf.Ln(-1)
 

diff --git a/internal/pdfexport/pdfexport_a5.go b/internal/pdfexport/pdfexport_a5.go
@@ -226,7 +226,7 @@ func printA5LogbookBodyB(record models.FlightRecord, fill bool) {
 	}
 	printBodyTimeCell(w3[20], record.SIM.Type, fill)
 	printBodyTimeCell(w3[21], record.SIM.Time, fill)
-	printBodyTextCell(w3[22], record.Remarks, fill)
+	printBodyRemarksCell(w3[22], record.Remarks, fill)
 
 	pdf.Ln(-1)