Skip to content

#4594 [PDF] fix : papripact label bug and fillin cotation cell #4605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evarisk-charles wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

#4594 [PDF] fix : papripact label bug and fillin cotation cell #4605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 21 additions & 26 deletions ...iskdolibarrdocuments/projectdocument/pdf_papripact_a3_paysage_projectdocument.modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,14 @@ public function __construct($db)
$this->posxref = $this->marge_gauche + 1; // Start position
$this->posxlabel = $this->posxref + 25; // Ref: 35mm
$this->posxdatestart = $this->posxlabel + 120; // Label: 65mm (main content)
$this->posxdateend = $this->posxdatestart + 25; // Start Date: 25mm
$this->posxworkload = $this->posxdateend + 25; // End Date: 25mm
$this->posxdateend = $this->posxdatestart + 20; // Start Date: 25mm
$this->posxworkload = $this->posxdateend + 20; // End Date: 25mm
$this->posxbudget = $this->posxworkload + 30; // Workload: 30mm
$this->posxprogress = $this->posxbudget + 15; // Budget: 40mm
$this->posxuser = $this->posxprogress + 25; // Progress: 25mm
$this->posxuser = $this->posxprogress + 20; // Progress: 25mm
$this->posxrisk = $this->posxuser + 30; // User: 30mm
$this->posxriskcategory = $this->posxrisk + 15; // Risk: 35mm
$this->posxriskassessment = $this->posxriskcategory + 65;
$this->posxriskcategory = $this->posxrisk + 25; // Risk: 35mm
$this->posxriskassessment = $this->posxriskcategory + 75;
} else {
$this->posxref = $this->marge_gauche + 1;
$this->posxlabel = $this->marge_gauche + 25;
Expand Down Expand Up @@ -426,7 +426,6 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa
$tmpArray += array("date_end" => $object->lines[$i]->date_end);
$tmpArray += array("workload" => $object->lines[$i]->planned_workload);
$tmpArray += array("userExecutive" => $userExecutives);

array_push($objectDoc, $tmpArray);
}
usort($objectDoc, function($a, $b) {
Expand Down Expand Up @@ -458,23 +457,19 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa
$totalbudget += $objectDoc[$i]['budget'];

$showpricebeforepagebreak = 1;

$labelHeightBefore = $pdf->GetY();
$pdf->startTransaction();
// Label
$pdf->SetXY($this->posxlabel, $curY);
$pdf->MultiCell($this->posxdatestart - $this->posxlabel, 3, $outputLangs->convToOutputCharset($libelleline), 0, 'L');
$labelHeightAfter = $pdf->GetY();
$labelHeight = $labelHeightAfter - $labelHeightBefore;
$pageposafter = $pdf->getPage();
if ($pageposafter > $pageposbefore) { // There is a pagebreak
$pdf->rollbackTransaction(true);
$pageposafter = $pageposbefore;
$pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.

// Label
$pdf->SetXY($this->posxlabel, $curY);
$posybefore = $pdf->GetY();
$pdf->MultiCell($this->posxbudget - $this->posxlabel, 3, $outputLangs->convToOutputCharset($libelleline), 0, 'L');
$pageposafter = $pdf->getPage();
$posyafter = $pdf->GetY();
$pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) { // There is no space left for total+free text
if ($i == ($nblines - 1)) { // No more lines, and no space left to show total, so we create a new page
$pdf->AddPage($this->orientation, '', true);
Expand Down Expand Up @@ -561,11 +556,11 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa

// task budget
$pdf->SetXY($this->posxbudget, $curY);
$pdf->MultiCell($this->posxprogress - $this->posxbudget, 6, $budget, 0, 'R');
$pdf->MultiCell($this->posxprogress - $this->posxbudget, 6, $budget, 0, 'C');

// Progress
$pdf->SetXY($this->posxprogress, $curY);
$pdf->MultiCell($this->posxuser - $this->posxprogress, 6, $progress, 0, 'R');
$pdf->MultiCell($this->posxuser - $this->posxprogress, 6, $progress, 0, 'C');
$pdf->SetFont(pdf_getPDFFont($outputLangs), '', $default_font_size - 1); // We restore font

// Executive name
Expand Down Expand Up @@ -598,7 +593,7 @@ public function write_file(SaturneDocuments $objectDocument, Translate $outputLa
}
}
$pdf->SetXY($this->posxriskassessment, $curY);
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxriskassessment, 6, $lastEvaluation, 0, 'R', true);
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxriskassessment, $labelHeight, $lastEvaluation, 0, 'C', true, 1, null, null, true, 0, false, true, 0, 'M');
$pdf->SetTextColor(0, 0, 0);

// Add line
Expand Down Expand Up @@ -750,39 +745,39 @@ protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputLangs, $

// Date start
$pdf->SetXY($this->posxdatestart, $tab_top + 1);
$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, $outputLangs->transnoentities('StartDate'), 0, 'C');
$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, $outputLangs->transnoentities('Début'), 0, 'C');

// Date end
$pdf->SetXY($this->posxdateend, $tab_top + 1);
$pdf->MultiCell($this->posxworkload - $this->posxdateend, 3, $outputLangs->transnoentities('EndDate'), 0, 'C');
$pdf->MultiCell($this->posxworkload - $this->posxdateend, 3, $outputLangs->transnoentities('Fin'), 0, 'C');

// Task Workload
$pdf->SetXY($this->posxworkload, $tab_top + 1);
$pdf->MultiCell($this->posxbudget - $this->posxworkload, 3, $outputLangs->transnoentities('PlannedWorkload'), 0, 'R');
$pdf->MultiCell($this->posxbudget - $this->posxworkload, 3, $outputLangs->transnoentities('CTP(h)'), 0, 'C');

// Task Budget
$pdf->SetXY($this->posxbudget, $tab_top + 1);
$pdf->MultiCell($this->posxprogress - $this->posxbudget, 3, $outputLangs->transnoentities('Budget'), 0, 'R');
$pdf->MultiCell($this->posxprogress - $this->posxbudget, 3, $outputLangs->transnoentities('Budget'), 0, 'C');

// Task Progress
$pdf->SetXY($this->posxprogress, $tab_top + 1);
$pdf->MultiCell($this->posxuser - $this->posxprogress, 3, $outputLangs->transnoentities('DigiriskProgress'), 0, 'R');
$pdf->MultiCell($this->posxuser - $this->posxprogress, 3, $outputLangs->transnoentities('ARD(%)'), 0, 'C');

// Executive user
$pdf->SetXY($this->posxuser, $tab_top + 1);
$pdf->MultiCell($this->posxrisk - $this->posxuser, 3, $outputLangs->transnoentities('Responsible'), 0, 'C');
$pdf->MultiCell($this->posxrisk - $this->posxuser, 3, $outputLangs->transnoentities('Resp.'), 0, 'C');

// Task Risk
$pdf->SetXY($this->posxrisk, $tab_top + 1);
$pdf->MultiCell($this->posxriskcategory - $this->posxrisk, 3, $outputLangs->transnoentities('LinkedRisk'), '', 'L');
$pdf->MultiCell($this->posxriskcategory - $this->posxrisk, 3, $outputLangs->transnoentities('Risk'), '', 'L');

// Rsk Category
$pdf->SetXY($this->posxriskcategory, $tab_top + 1);
$pdf->MultiCell($this->posxriskassessment - $this->posxrisk, 3, $outputLangs->transnoentities('RiskCategoryEdit'), '', 'L');
$pdf->MultiCell($this->posxriskassessment - $this->posxriskcategory, 3, $outputLangs->transnoentities('RiskCategoryEdit'), '', 'L');

// Risk Evaluation
$pdf->SetXY($this->posxriskassessment, $tab_top + 1);
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxriskassessment, 3, $outputLangs->transnoentities('Cotation'), '', 'R');
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxriskassessment, 3, $outputLangs->transnoentities('Cot.'), '', 'C');
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
Expand Down