From e0cf79e2853dface6485b1094af05134b3805680 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 27 May 2023 03:06:46 +0000 Subject: [PATCH] rector fixes + bug fixes --- tests/depreciation/view.pdf.php | 30 ++++++++++++------------- tests/depreciation/view.ppt.php | 40 ++++++++++++++++----------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/tests/depreciation/view.pdf.php b/tests/depreciation/view.pdf.php index c092303..6792f78 100755 --- a/tests/depreciation/view.pdf.php +++ b/tests/depreciation/view.pdf.php @@ -48,24 +48,24 @@ $pdf->SetFillColor(67, 74, 81); $pdf->Rect(0, 110, $pdf->getPageWidth(), 145, 'F'); $html = ' - - - - - - - + + + + + + + '; for ($i = 1; $i <= $duration; ++$i) { - $html .= ''; - $thml .= ''; - $thml .= ''; - $thml .= ''; - $thml .= ''; - $thml .= ''; - $thml .= ''; - $thml .= ''; + $html .= ''; + $thml .= ''; + $thml .= ''; + $thml .= ''; + $thml .= ''; + $thml .= ''; + $thml .= ''; + $thml .= ''; } $html = '
' . $lang['Period'] . '' . $lang['StraightLine'] . '' . $lang['ArithmeticDegressive'] . '' . $lang['ArithmeticProgressive'] . '' . $lang['GeometricDegressive'] . '' . $lang['GeometricProgressive'] . '
' . $lang['Period'] . '' . $lang['StraightLine'] . '' . $lang['ArithmeticDegressive'] . '' . $lang['ArithmeticProgressive'] . '' . $lang['GeometricDegressive'] . '' . $lang['GeometricProgressive'] . '
' . $i . '' . $this->getCurrency(Depreciation::getStraightLineResidualInT($amount, $duration, $i), 'medium', '') . '' . $this->getCurrency(Depreciation::getArithmeticDegressiveDepreciationResidualInT($amount, 0.0, $duration, $i), 'medium', '') . '' . $this->getCurrency(Depreciation::getArithmeticProgressiveDepreciationResidualInT($amount, 0.0, $duration, $i), 'medium', '') . '' . $this->getCurrency(Depreciation::getGeometicProgressiveDepreciationResidualInT($amount, $amount * 0.1, $duration, $i), 'medium', '') . '' . $this->getCurrency(Depreciation::getGeometicDegressiveDepreciationResidualInT($amount, $amount * 0.1, $duration, $i), 'medium', '') . '
' . $i . '' . $this->getCurrency(Depreciation::getStraightLineResidualInT($amount, $duration, $i), 'medium', '') . '' . $this->getCurrency(Depreciation::getArithmeticDegressiveDepreciationResidualInT($amount, 0.0, $duration, $i), 'medium', '') . '' . $this->getCurrency(Depreciation::getArithmeticProgressiveDepreciationResidualInT($amount, 0.0, $duration, $i), 'medium', '') . '' . $this->getCurrency(Depreciation::getGeometicProgressiveDepreciationResidualInT($amount, $amount * 0.1, $duration, $i), 'medium', '') . '' . $this->getCurrency(Depreciation::getGeometicDegressiveDepreciationResidualInT($amount, $amount * 0.1, $duration, $i), 'medium', '') . '
'; diff --git a/tests/depreciation/view.ppt.php b/tests/depreciation/view.ppt.php index 95bdffd..4559300 100755 --- a/tests/depreciation/view.ppt.php +++ b/tests/depreciation/view.ppt.php @@ -49,10 +49,10 @@ $oSlide1->setBackground($oBkgColor); $shape = new File(); $shape->setName('Company Logo') - ->setDescription('Company Logo') - ->setPath(__DIR__ . '/logo.png') - ->setHeight(300) - ->setOffsetX(320) + ->setDescription('Company Logo') + ->setPath(__DIR__ . '/logo.png') + ->setHeight(300) + ->setOffsetX(320) ->setOffsetY(120); $oSlide1->addShape($shape); @@ -145,10 +145,10 @@ $shape->createParagraph()->createTextRun('Word'); $shape = new File(); $shape->setName('Company Logo') - ->setDescription('Company Logo') - ->setPath(__DIR__ . '/logo.png') - ->setHeight(50) - ->setOffsetX(880) + ->setDescription('Company Logo') + ->setPath(__DIR__ . '/logo.png') + ->setHeight(50) + ->setOffsetX(880) ->setOffsetY(650); $oSlide2->addShape($shape); @@ -234,10 +234,10 @@ $shape->createParagraph() $shape = new File(); $shape->setName('Company Logo') - ->setDescription('Company Logo') - ->setPath(__DIR__ . '/logo.png') - ->setHeight(50) - ->setOffsetX(880) + ->setDescription('Company Logo') + ->setPath(__DIR__ . '/logo.png') + ->setHeight(50) + ->setOffsetX(880) ->setOffsetY(650); $oSlide3->addShape($shape); @@ -301,10 +301,10 @@ $shape->createParagraph()->createTextRun('Internal APIs (everything from the Kar $shape = new File(); $shape->setName('Company Logo') - ->setDescription('Company Logo') - ->setPath(__DIR__ . '/logo.png') - ->setHeight(50) - ->setOffsetX(880) + ->setDescription('Company Logo') + ->setPath(__DIR__ . '/logo.png') + ->setHeight(50) + ->setOffsetX(880) ->setOffsetY(650); $oSlide4->addShape($shape); @@ -314,10 +314,10 @@ $oSlide5->setBackground($oBkgColor); $shape = new File(); $shape->setName('Company Logo') - ->setDescription('Company Logo') - ->setPath(__DIR__ . '/logo.png') - ->setHeight(300) - ->setOffsetX(320) + ->setDescription('Company Logo') + ->setPath(__DIR__ . '/logo.png') + ->setHeight(300) + ->setOffsetX(320) ->setOffsetY(120); $oSlide5->addShape($shape);