Fix attendence sheet, refs #1346

- header override on pages > 1
- missing main title
- remove dbug border

diff --git a/galette/includes/routes/members.routes.php b/galette/includes/routes/members.routes.php
index b6064c6a433412172eabcda70a99481a61005f78..a3d4ed63ef9b0b40e29511978b7d517585297b2f 100644 (file)
--- a/galette/includes/routes/members.routes.php
+++ b/galette/includes/routes/members.routes.php
@@ -2751,7 +2751,7 @@ $app->post(
         if (isset($post['sheet_photos']) && $post['sheet_photos'] === '1') {
             $pdf->withImages();
         }
-        $pdf->drawSheet($members, $doc_title);
+        $pdf->drawSheet($members);
         $response = $this->response->withHeader('Content-type', 'application/pdf');
         $response->write($pdf->Output(_T("attendance_sheet") . '.pdf', 'D'));
         return $response;

diff --git a/galette/lib/Galette/IO/Pdf.php b/galette/lib/Galette/IO/Pdf.php
index ad8808acdbb796b7b4aeba8cef11edb3c981f844..811c83493c2dda4b3c988cdf7111e6143a11b22c 100644 (file)
--- a/galette/lib/Galette/IO/Pdf.php
+++ b/galette/lib/Galette/IO/Pdf.php
@@ -304,6 +304,11 @@ class Pdf extends \TCPDF
             }
             $html .= $this->model->hheader;
             $this->writeHtml($html, true, false, true, false, '');
+
+            if ($title !== null) {
+                $this->writeHtml('<h2 style="text-align:center;">' . $title . '</h2>');
+            }
+
             if (trim($this->model->title) !== '') {
                 $htitle = '';
                 if (trim($this->model->hstyles) !== '') {

diff --git a/galette/lib/Galette/IO/PdfAttendanceSheet.php b/galette/lib/Galette/IO/PdfAttendanceSheet.php
index 67605b2b1aaf2e13815a4903277f6c25b0aeb947..3c8f63e7b79a8109a960a9c09344f06c2429993f 100644 (file)
--- a/galette/lib/Galette/IO/PdfAttendanceSheet.php
+++ b/galette/lib/Galette/IO/PdfAttendanceSheet.php
@@ -75,6 +75,8 @@ class PdfAttendanceSheet extends Pdf
     public function Header() // phpcs:ignore PSR1.Methods.CamelCapsMethodName
     {
         if ($this->PageNo() > 1) {
+            $this->setTopMargin(15);
+            $this->setY(10);
             $this->SetFont(Pdf::FONT, '', self::SHEET_FONT);
             $head_title = $this->doc_title;
             if ($this->sheet_title !== null) {
@@ -86,7 +88,7 @@ class PdfAttendanceSheet extends Pdf
             if ($this->sheet_date !== null) {
                 $head_title .= ' - ' . $this->sheet_date->format(__("Y-m-d"));
             }
-            $this->Cell(0, 10, $head_title, 1, false, 'C', 0, '', 0, false, 'M', 'M');
+            $this->Cell(0, 10, $head_title, 0, false, 'C', 0, '', 0, false, 'M', 'M');
         }
     }
 
@@ -149,16 +151,15 @@ class PdfAttendanceSheet extends Pdf
     /**
      * Draw members cards
      *
-     * @param array  $members   Members
-     * @param string $doc_title Document title
+     * @param array $members Members
      *
      * @return void
      */
-    public function drawSheet($members, $doc_title)
+    public function drawSheet($members)
     {
         $this->Open();
         $this->AddPage();
-        $this->PageHeader($doc_title);
+        $this->PageHeader($this->doc_title);
 
         if ($this->sheet_date) {
             $date_fmt = null;