[TikiWiki-commits] [Git][tikiwiki/tiki][30.x] [BP][ENH] Calendar: add fit to width option for calendar PDF export

luci pushed to branch 30.x at Tiki Wiki CMS Groupware / Tiki


Commits:
a23f4cc5 by Adrien Mbuya Maloba at 2026-06-13T01:28:10+00:00
[BP][ENH] Calendar: add fit to width option for calendar PDF export
---
* [ENH] Calendar: add fit to width option for calendar PDF export
---
* [ENH] Calendar: add fit to width option for calendar PDF export

See merge request tikiwiki/tiki!10283

See merge request tikiwiki/tiki!10506

- - - - -


4 changed files:

- lib/prefs/calendar.php
- lib/setup/javascript.php
- src/js/jquery-tiki/eventcalendar_to_pdf.js
- templates/admin/include_calendar.tpl


Changes:

=====================================
lib/prefs/calendar.php
=====================================
@@ -183,5 +183,15 @@ function prefs_calendar_list()
             'default' => '',
             'profile_reference' => 'calendar',
         ],
+        'calendar_pdf_export_layout' => [
+            'name' => tra('PDF export layout'),
+            'description' => tra('Choose how the exported PDF should be scaled.'),
+            'type' => 'list',
+            'options' => [
+                'fit_to_width' => tr('Fit to width'),
+                'fit_on_one_page' => tr('Fit on one page'),
+            ],
+            'default' => 'fit_on_one_page',
+        ],
     ];
 }


=====================================
lib/setup/javascript.php
=====================================
@@ -250,6 +250,7 @@ $jqueryTiki['BUILTIN_COOKIE_CATEGORY_ESSENTIAL'] = json_encode(CookieConsentLib:
 $jqueryTiki['wiki_url_scheme'] = $prefs['wiki_url_scheme'];
 $jqueryTiki['feature_queued_tasks'] = ($prefs['feature_queued_tasks'] ?? 'n') === 'y';
 $jqueryTiki['queued_tasks_js_processing_disabled'] = ($prefs['queued_tasks_js_processing_disabled'] ?? 'n') === 'y';
+$jqueryTiki['calendar_pdf_export_layout'] = $prefs['calendar_pdf_export_layout'];
 // Check if user has active tasks (Pending or InProgress) to enable smart polling
 $hasActiveJobs = false;
 if (($prefs['feature_queued_tasks'] ?? 'n') === 'y') {


=====================================
src/js/jquery-tiki/eventcalendar_to_pdf.js
=====================================
@@ -36,15 +36,91 @@ $.fn.addEventCalendarPrint = function (buttonId, calendar) {
                 var heightLeft = imgHeight;
                 var doc = new jsPDF("p", "mm");
                 doc.setFontSize(14);
-                doc.text((210 - imgWidth) / 2, 20, calendarTitle.replace(/\s+/g, " "));
+                const pageWidthMm = 210;
+                doc.text((pageWidthMm - imgWidth) / 2, 20, calendarTitle.replace(/\s+/g, " "));
 
-                if (imgHeight > pageHeight) {
-                    imgHeight = pageHeight;
-                    imgWidth = (canvas.width * imgHeight) / canvas.height;
-                }
+                // Fit calendar to width (multi-pages)
+                if (jqueryTiki.calendar_pdf_export_layout === "fit_to_width") {
+                    var marginTop = 30;
+                    var marginRight = 20;
+                    var marginBottom = 10;
+                    const pageHeightMm = 297;
+                    const printableHeight = pageHeightMm - marginTop - marginBottom;
+                    const pxPerMm = canvas.width / imgWidth; // Scale factor to convert canvas coordinates (px) into PDF units (mm)
+                    const pageHeightPx = printableHeight * pxPerMm;
+                    const pageNumberX = pageWidthMm - marginRight;
+                    const pageNumberY = pageHeightMm - marginBottom;
+                    const rows = $(calendarId + " .ec-days");
+                    const containerRect = elementToPrint[0].getBoundingClientRect();
+                    const rowBoundaries = [];
+
+                    rows.each(function () {
+                        const rect = this.getBoundingClientRect();
+                        rowBoundaries.push({
+                            top: rect.top - containerRect.top,
+                            bottom: rect.bottom - containerRect.top,
+                        });
+                    });
+
+                    const scaleFactor = canvas.height / elementToPrint[0].scrollHeight;
+
+                    const scaledRows = rowBoundaries.map((r) => ({
+                        top: r.top * scaleFactor,
+                        bottom: r.bottom * scaleFactor,
+                    }));
+
+                    function findSafeBreak(target) {
+                        let safe = target;
+                        for (let i = 0; i < scaledRows.length; i++) {
+                            if (scaledRows[i].top < target && scaledRows[i].bottom > target) {
+                                safe = scaledRows[i].top;
+                                break;
+                            }
+                        }
+                        return safe;
+                    }
 
-                doc.addImage(imgData, "JPEG", (210 - imgWidth) / 2, 30, imgWidth, heightLeft > pageHeight ? pageHeight : heightLeft);
+                    let startY = 0;
+                    let pageNumber = 1;
+                    // Generating new pages
+                    while (startY < canvas.height) {
+                        let target = startY + pageHeightPx;
+                        let endY = findSafeBreak(target);
 
+                        if (endY <= startY) {
+                            endY = Math.min(target, canvas.height);
+                        }
+
+                        endY = Math.min(endY, canvas.height);
+                        const sliceHeight = Math.max(0, endY - startY);
+                        if (sliceHeight <= 1) break;
+
+                        const pageCanvas = document.createElement("canvas");
+                        pageCanvas.width = canvas.width;
+                        pageCanvas.height = sliceHeight;
+                        const context = pageCanvas.getContext("2d");
+                        context.drawImage(canvas, 0, startY, canvas.width, sliceHeight, 0, 0, canvas.width, sliceHeight);
+                        const pageImage = pageCanvas.toDataURL("image/jpeg", 1.0);
+                        const renderedHeight = sliceHeight / pxPerMm;
+
+                        if (pageNumber > 1) {
+                            doc.addPage();
+                        }
+
+                        doc.addImage(pageImage, "JPEG", (pageWidthMm - imgWidth) / 2, marginTop, imgWidth, renderedHeight);
+                        doc.setFontSize(7);
+                        doc.text("Page " + pageNumber, pageNumberX, pageNumberY);
+                        pageNumber++;
+                        startY = endY;
+                    }
+                } else {
+                    // Calendar fit on one page
+                    if (imgHeight > pageHeight) {
+                        imgHeight = pageHeight;
+                        imgWidth = (canvas.width * imgHeight) / canvas.height;
+                    }
+                    doc.addImage(imgData, "JPEG", (pageWidthMm - imgWidth) / 2, 30, imgWidth, heightLeft > pageHeight ? pageHeight : heightLeft);
+                }
                 doc.save(calendarTitle + ".pdf");
             });
         }, 200);


=====================================
templates/admin/include_calendar.tpl
=====================================
@@ -48,6 +48,7 @@
         {preference name=calendar_description_is_html}
         {preference name=calendar_watch_editor}
         {preference name=calendar_holidays}
+        {preference name=calendar_pdf_export_layout}
     </fieldset>
     </div>
     {include file='admin/include_apply_bottom.tpl'}



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/a23f4cc5b0fddf01003797b6a1997a8d2e8b7e9c

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/a23f4cc5b0fddf01003797b6a1997a8d2e8b7e9c
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs