Merge pull request #2430 from phili67/phili67-fundraiser-report-bug-res

Fundraiser report bug resolution
phili67 · Jun 9, 2023 · 31cd807 · 31cd807
2 parents a1ebb03 + 00b31f2
commit 31cd807
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 101 deletions.
diff --git a/src/EcclesiaCRM/Reports/PDF_CertificatesReport.php b/src/EcclesiaCRM/Reports/PDF_CertificatesReport.php
diff --git a/src/EcclesiaCRM/Reports/PDF_FundRaiserReport.php b/src/EcclesiaCRM/Reports/PDF_FundRaiserReport.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace EcclesiaCRM\Reports;
+
+class PDF_FRReport extends ChurchInfoReportTCPDF
+{
+    public $leftX = 10;
+    public $orientation = 10;
+    public $format = 10;
+    public $fr_title = 'Voila';
+    public $fr_description = 'coucou';
+    public $curY = 0;
+
+    public function __construct($fundTitle, $fundDescription)
+    {
+        parent::__construct('P', 'mm', $this->paperFormat);
+        $this->leftX = 10;
+        $this->SetFont('Times', '', 10);
+        $this->SetMargins(10, 20);
+
+        $this->fr_title = $fundTitle;
+        $this->fr_description = $fundDescription;
+
+        $this->AddCustomPage();
+        $this->SetAutoPageBreak(true, 25);
+    }
+
+    public function AddCustomPage()
+    {
+        parent::AddPage();
+
+        $this->SetFont('Times', 'B', 16);
+        $this->Write(8, $this->fr_title."\n");
+        $this->curY += 8;
+        $this->Write(8, $this->fr_description."\n\n");
+        $this->curY += 8;
+        $this->SetFont('Times', '', 12);
+    }
+}
+
+class PDF_FRCatalogReport extends PDF_FRReport
+{
+}
+
+class PDF_CertificatesReport extends PDF_FRReport
+{
+    public function AddCustomPage()
+    {
+        parent::AddPage();
+
+        $this->SetFont('Times', 'B', 16);
+        $this->Write(8, $this->fr_title."\n");
+        $this->curY += 8;
+        $this->Write(8, $this->fr_description."\n\n");
+        $this->curY += 8;
+        $this->SetFont('Times', 'B', 36);
+        $this->Write(8, _('Certificate of Ownership')."\n\n");
+        $this->curY += 8;
+        $this->SetFont('Times', '', 10);
+    }
+}
+
+class PDF_FRBidSheetsReport extends PDF_FRReport
+{
+}
diff --git a/src/Reports/FRBidSheets.php b/src/Reports/FRBidSheets.php
@@ -11,7 +11,8 @@
 require '../Include/Functions.php';
 
 use EcclesiaCRM\dto\SystemConfig;
-use EcclesiaCRM\Reports\ChurchInfoReportTCPDF;
+
+use EcclesiaCRM\Reports\PDF_FRBidSheetsReport;
 
 use EcclesiaCRM\Utils\OutputUtils;
 
@@ -25,40 +26,14 @@
 
 $iCurrentFundraiser = $_GET['CurrentFundraiser'];
 
-class PDF_FRBidSheetsReport extends ChurchInfoReportTCPDF
-{
-    private $fundraiser = null;
-
-    // Constructor
-    public function __construct($fundraiser)
-    {
-        parent::__construct('P', 'mm', $this->paperFormat);
-        $this->fundraiser = $fundraiser;
-        $this->leftX = 10;
-        $this->SetFont('Times', '', 10);
-        $this->SetMargins(15, 25);
-
-        $this->SetAutoPageBreak(true, 25);
-    }
-
-    public function AddPage($orientation = '', $format = '')
-    {
-        parent::AddPage($orientation, $format);
-
-        //$this->SetFont("Times",'B',16);
-    	//$this->Write (8, $this->fundraiser->getTitle()."\n");
-		//$curY += 8;
-		//$this->Write (8, $this->fundraiser->getDescription()."\n\n");
-		//$curY += 8;
-   	    //$this->SetFont("Times",'',10);
-    }
-}
-
 $currency = SystemConfig::getValue("sCurrency");
 
 // Get the information about this fundraiser
 $thisFRORM = FundRaiserQuery::create()->findOneById($iCurrentFundraiser);
 
+$fundTitle = $thisFRORM->getTitle();
+$fundDescription = $thisFRORM->getDescription();
+
 // Get all the donated items
 $ormItems = DonatedItemQuery::create()
     ->addJoin(DonatedItemTableMap::COL_DI_DONOR_ID, PersonTableMap::COL_PER_ID, Criteria::LEFT_JOIN)
@@ -72,7 +47,7 @@ public function AddPage($orientation = '', $format = '')
     ->orderBy('cri3')
     ->findByFrId($iCurrentFundraiser);
 
-$pdf = new PDF_FRBidSheetsReport($thisFRORM);
+$pdf = new PDF_FRBidSheetsReport($fundTitle, $fundDescription);
 $pdf->SetTitle($thisFRORM->getTitle());
 
 // Loop through items

diff --git a/src/Reports/FRCatalog.php b/src/Reports/FRCatalog.php
@@ -12,7 +12,6 @@
 require '../Include/Functions.php';
 
 use EcclesiaCRM\dto\SystemConfig;
-use EcclesiaCRM\Reports\ChurchInfoReportTCPDF;
 use EcclesiaCRM\Utils\OutputUtils;
 
 use EcclesiaCRM\FundRaiserQuery;
@@ -21,44 +20,20 @@
 use EcclesiaCRM\Map\PersonTableMap;
 use EcclesiaCRM\Map\DonatedItemTableMap;
 
+use EcclesiaCRM\Reports\PDF_FRCatalogReport;
+
 use Propel\Runtime\ActiveQuery\Criteria;
 
 $iCurrentFundraiser = $_GET['CurrentFundraiser'];
 
 $curY = 0;
 
-class PDF_FRCatalogReport extends ChurchInfoReportTCPDF
-{
-    // Constructor
-    public function __construct()
-    {
-        parent::__construct('P', 'mm', $this->paperFormat);
-        $this->leftX = 10;
-        $this->SetFont('Times', '', 10);
-        $this->SetMargins(10, 20);
-
-        $this->AddPage();
-        $this->SetAutoPageBreak(true, 25);
-    }
-
-    public function AddPage($orientation = '', $format = '')
-    {
-        global $fr_title, $fr_description, $curY;
-
-        parent::AddPage($orientation, $format);
-
-        $this->SetFont('Times', 'B', 16);
-        $this->Write(8, $fr_title."\n");
-        $curY += 8;
-        $this->Write(8, $fr_description."\n\n");
-        $curY += 8;
-        $this->SetFont('Times', '', 12);
-    }
-}
-
 // Get the information about this fundraiser
 $thisFRORM = FundRaiserQuery::create()->findOneById($iCurrentFundraiser);
 
+$fundTitle = $thisFRORM->getTitle();
+$fundDescription = $thisFRORM->getDescription();
+
 $currency = SystemConfig::getValue("sCurrency");
 
 // Get all the donated items
@@ -74,8 +49,8 @@ public function AddPage($orientation = '', $format = '')
     ->orderBy('cri3')
     ->findByFrId($iCurrentFundraiser);
 
-$pdf = new PDF_FRCatalogReport();
-$pdf->SetTitle($thisFRORM->getTitle());
+$pdf = new PDF_FRCatalogReport($fundTitle, $fundDescription);
+$pdf->SetTitle($fundTitle);
 
 // Loop through items
 $idFirstChar = '';
@@ -97,9 +72,11 @@ public function AddPage($orientation = '', $format = '')
 
     if ($item->getPicture() != '' && strlen($item->getPicture()) > 5) {
         $s = getimagesize($item->getPicture());
-        $h = (100.0 / $s[0]) * $s[1];
-        $pdf->Image($item->getPicture(), $pdf->GetX(), $pdf->GetY(), 100.0, $h);
-        $pdf->SetY($pdf->GetY() + $h);
+        if ($s[0]>0) {
+            $h = (100.0 / $s[0]) * $s[1];
+            $pdf->Image($item->getPicture(), $pdf->GetX(), $pdf->GetY(), 100.0, $h);
+            $pdf->SetY($pdf->GetY() + $h);
+        }
     }
 
     $pdf->SetFont('Times', '', 12);

diff --git a/src/Reports/FRCertificates.php b/src/Reports/FRCertificates.php
@@ -27,6 +27,10 @@
 // Get the information about this fundraiser
 $thisFRORM = FundRaiserQuery::create()->findOneById($iCurrentFundraiser);
 
+$fundTitle = $thisFRORM->getTitle();
+$fundDescription = $thisFRORM->getDescription();
+
+
 // Get all the donated items
 $ormItems = DonatedItemQuery::create()
         ->addJoin(DonatedItemTableMap::COL_DI_DONOR_ID, PersonTableMap::COL_PER_ID, Criteria::LEFT_JOIN)
@@ -35,7 +39,7 @@
         ->orderByItem()
         ->findByFrId($iCurrentFundraiser);
 
-$pdf = new PDF_CertificatesReport();
+$pdf = new PDF_CertificatesReport($fundTitle, $fundDescription);
 $pdf->SetTitle($thisFRORM->getTitle());
 
 $currency = SystemConfig::getValue("sCurrency");

diff --git a/src/mysql/upgrade/8.0.0-upgrade.php b/src/mysql/upgrade/8.0.0-upgrade.php
@@ -102,6 +102,8 @@
 unlink(SystemURLs::getDocumentRoot()."/ManageEnvelopes.php");
 unlink(SystemURLs::getDocumentRoot()."/FinancialReports.php");
 
+unlink(SystemURLs::getDocumentRoot()."/EcclesiaCRM/Reports/PDF_CertificatesReport.php");
+
 // 2023-06-08
 unlink(SystemURLs::getDocumentRoot()."/FundRaiserEditor.php");
 unlink(SystemURLs::getDocumentRoot()."/GroupPropsEditor.php");