fix: Allow scaling labels to page width

Author: kumy

website/app-templates/smarty/elements/label_form_common.tpl

@@ -24,6 +24,19 @@
     </div>
 </div>
 
+<div class="form-group">
+    <label for="fit_to_page_width" class="col-sm-2 control-label">{t}Label Size{/t}</label>
+    <div class="col-sm-10">
+        <div class="checkbox">
+            <label>
+                <input type="checkbox" name="fit_to_page_width" id="fit_to_page_width" value="1" />
+                {t}Fit label to page width (100%){/t}
+            </label>
+        </div>
+        <p class="help-block">{t}If checked, the label will be scaled to fit 100% of the page width. If unchecked, the label will be printed at its default size.{/t}</p>
+    </div>
+</div>
+
 <div class="form-group">
     <div class="col-sm-offset-2 col-sm-10">
         {call csrf}

website/app-templates/smarty/forms/geokrety_labels.tpl

@@ -41,6 +41,23 @@
                 <ul class="col-sm-4 alert alert-success hidden list-unstyled" id="nrResult"></ul>
             </div>
 
+            <div class="row">
+                <div class="col-sm-8">
+                    <div class="form-group">
+                        <label for="fit_to_page_width" class="col-sm-2 control-label">{t}Label Size{/t}</label>
+                        <div class="col-sm-10">
+                            <div class="checkbox">
+                                <label>
+                                    <input type="checkbox" name="fit_to_page_width" id="fit_to_page_width" value="1" />
+                                    {t}Fit each label to page width (100%){/t}
+                                </label>
+                            </div>
+                            <p class="help-block">{t}If checked, each label will be scaled to fit 100% of the page width. If unchecked, labels will be printed at their default size.{/t}</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <div class="form-group">
                 <div class="col-sm-offset-2 col-sm-10">
                     {call csrf}

website/app-templates/smarty/pages/geokrety_labels.tpl

@@ -2,13 +2,17 @@
 
 {block name=title}{t}Mass label generator{/t}{/block}
 
+{\GeoKrety\Assets::instance()->addCss(GK_CDN_TOM_SELECT_CSS) && ''}
+{\GeoKrety\Assets::instance()->addJs(GK_CDN_TOM_SELECT_JS) && ''}
+
 {block name=content}
 <h1>{t}Mass label generator{/t}</h1>
 {include file='forms/geokrety_labels.tpl'}
 {/block}
 
 {block name=javascript}
     {include file = "js/dialogs/dialog_geokret_move_select_from_inventory.tpl.js"}
+    {include file = "js/moves/tomselect-inventory.tpl.js"}
     {include file = "js/moves/geokret_nr.validation.tpl.js"}
     {include file = "js/moves/geokret_move.inventory.tpl.js"}
 

website/app/GeoKrety/Controller/Pages/GeokretLabel.php

@@ -106,6 +106,12 @@ public function pdf() {
         $this->prepare_values();
         $pdf = new Pdf(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
         $pdf->addGeokrety($this->geokret);
+
+        // Apply fit to page width if requested
+        $f3 = \Base::instance();
+        $fitToPageWidth = !empty($f3->get('POST.fit_to_page_width'));
+        $pdf->setFitToPageWidth($fitToPageWidth);
+
         $pdf->setLanguages($this->langs);
         $pdf->render();
     }

website/app/GeoKrety/Controller/Pages/GeokretyLabels.php

@@ -46,6 +46,11 @@ public function pdf(\Base $f3) {
 
         $pdf = new Pdf(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
         $pdf->addGeokrety(...(array) $geokrety);
+
+        // Apply fit to page width if requested
+        $fitToPageWidth = !empty($f3->get('POST.fit_to_page_width'));
+        $pdf->setFitToPageWidth($fitToPageWidth);
+
         $pdf->setLanguages($this->languages);
         $pdf->render();
     }

website/app/GeoKrety/Service/Labels/Pdf.php

@@ -10,6 +10,7 @@ class Pdf extends \TCPDF {
     public const LABEL_OUTPUT_DPI = 300;
 
     private array $geokrety = [];
+    private bool $fitToPageWidth = false;
 
     public function __construct($orientation = 'P', $unit = 'mm', $format = 'A4', $unicode = true, $encoding = 'UTF-8', $diskcache = false, $pdfa = false) {
         parent::__construct($orientation, $unit, $format, $unicode, $encoding, $diskcache, $pdfa);
@@ -96,12 +97,19 @@ public function addGeokrety(Geokret ...$geokrety) {
         $this->geokrety = array_merge($this->geokrety, $geokrety);
     }
 
+    public function setFitToPageWidth(bool $fitToPageWidth) {
+        $this->fitToPageWidth = $fitToPageWidth;
+    }
+
     public function render() {
         $startLeft = $posX = PDF_MARGIN_LEFT;
         $startTop = $posY = 13;
         $image = new Image();
         $image->setLanguages($this->languages);
 
+        // Calculate available page width
+        $availablePageWidth = $this->getPageWidth() - PDF_MARGIN_LEFT - PDF_MARGIN_RIGHT;
+
         $imgPrevH = 0;
         for ($i = 0; $i < sizeof($this->geokrety); ++$i) {
             $labelPNGData = $image->png($this->geokrety[$i]);
@@ -111,13 +119,22 @@ public function render() {
             $imgW = $imageSize[0] * 25.4 / self::LABEL_OUTPUT_DPI;
             $imgH = $imageSize[1] * 25.4 / self::LABEL_OUTPUT_DPI;
 
+            // Apply fit to page width scaling if enabled
+            if ($this->fitToPageWidth) {
+                $scaleFactor = $availablePageWidth / $imgW;
+                $imgW *= $scaleFactor;
+                $imgH *= $scaleFactor;
+            }
+
             if ($posX + $imgW > $this->getPageWidth() - $startLeft) {
                 $posX = $startLeft;
                 $posY += $imgPrevH;
+                $imgPrevH = 0; // Reset row height for new row
             }
 
             if ($posY + $imgH > $this->getPageHeight() - $startTop) {
                 $posY = $startTop;
+                $imgPrevH = 0; // Reset row height for new page
                 $this->AddPage();
             }