rector fixes + bug fixes

This commit is contained in:
Dennis Eichhorn 2023-05-27 03:06:46 +00:00
parent cfaa340766
commit e0cf79e285
2 changed files with 35 additions and 35 deletions

View File

@ -48,24 +48,24 @@ $pdf->SetFillColor(67, 74, 81);
$pdf->Rect(0, 110, $pdf->getPageWidth(), 145, 'F'); $pdf->Rect(0, 110, $pdf->getPageWidth(), 145, 'F');
$html = '<table> $html = '<table>
<tr> <tr>
<th>' . $lang['Period'] . '</th> <th>' . $lang['Period'] . '</th>
<th>' . $lang['StraightLine'] . '</th> <th>' . $lang['StraightLine'] . '</th>
<th>' . $lang['ArithmeticDegressive'] . '</th> <th>' . $lang['ArithmeticDegressive'] . '</th>
<th>' . $lang['ArithmeticProgressive'] . '</th> <th>' . $lang['ArithmeticProgressive'] . '</th>
<th>' . $lang['GeometricDegressive'] . '</th> <th>' . $lang['GeometricDegressive'] . '</th>
<th>' . $lang['GeometricProgressive'] . '</th> <th>' . $lang['GeometricProgressive'] . '</th>
</tr>'; </tr>';
for ($i = 1; $i <= $duration; ++$i) { for ($i = 1; $i <= $duration; ++$i) {
$html .= '<tr>'; $html .= '<tr>';
$thml .= '<td>' . $i . '</td>'; $thml .= '<td>' . $i . '</td>';
$thml .= '<td>' . $this->getCurrency(Depreciation::getStraightLineResidualInT($amount, $duration, $i), 'medium', '') . '</td>'; $thml .= '<td>' . $this->getCurrency(Depreciation::getStraightLineResidualInT($amount, $duration, $i), 'medium', '') . '</td>';
$thml .= '<td>' . $this->getCurrency(Depreciation::getArithmeticDegressiveDepreciationResidualInT($amount, 0.0, $duration, $i), 'medium', '') . '</td>'; $thml .= '<td>' . $this->getCurrency(Depreciation::getArithmeticDegressiveDepreciationResidualInT($amount, 0.0, $duration, $i), 'medium', '') . '</td>';
$thml .= '<td>' . $this->getCurrency(Depreciation::getArithmeticProgressiveDepreciationResidualInT($amount, 0.0, $duration, $i), 'medium', '') . '</td>'; $thml .= '<td>' . $this->getCurrency(Depreciation::getArithmeticProgressiveDepreciationResidualInT($amount, 0.0, $duration, $i), 'medium', '') . '</td>';
$thml .= '<td>' . $this->getCurrency(Depreciation::getGeometicProgressiveDepreciationResidualInT($amount, $amount * 0.1, $duration, $i), 'medium', '') . '</td>'; $thml .= '<td>' . $this->getCurrency(Depreciation::getGeometicProgressiveDepreciationResidualInT($amount, $amount * 0.1, $duration, $i), 'medium', '') . '</td>';
$thml .= '<td>' . $this->getCurrency(Depreciation::getGeometicDegressiveDepreciationResidualInT($amount, $amount * 0.1, $duration, $i), 'medium', '') . '</td>'; $thml .= '<td>' . $this->getCurrency(Depreciation::getGeometicDegressiveDepreciationResidualInT($amount, $amount * 0.1, $duration, $i), 'medium', '') . '</td>';
$thml .= '</tr>'; $thml .= '</tr>';
} }
$html = '</table>'; $html = '</table>';

View File

@ -49,10 +49,10 @@ $oSlide1->setBackground($oBkgColor);
$shape = new File(); $shape = new File();
$shape->setName('Company Logo') $shape->setName('Company Logo')
->setDescription('Company Logo') ->setDescription('Company Logo')
->setPath(__DIR__ . '/logo.png') ->setPath(__DIR__ . '/logo.png')
->setHeight(300) ->setHeight(300)
->setOffsetX(320) ->setOffsetX(320)
->setOffsetY(120); ->setOffsetY(120);
$oSlide1->addShape($shape); $oSlide1->addShape($shape);
@ -145,10 +145,10 @@ $shape->createParagraph()->createTextRun('Word');
$shape = new File(); $shape = new File();
$shape->setName('Company Logo') $shape->setName('Company Logo')
->setDescription('Company Logo') ->setDescription('Company Logo')
->setPath(__DIR__ . '/logo.png') ->setPath(__DIR__ . '/logo.png')
->setHeight(50) ->setHeight(50)
->setOffsetX(880) ->setOffsetX(880)
->setOffsetY(650); ->setOffsetY(650);
$oSlide2->addShape($shape); $oSlide2->addShape($shape);
@ -234,10 +234,10 @@ $shape->createParagraph()
$shape = new File(); $shape = new File();
$shape->setName('Company Logo') $shape->setName('Company Logo')
->setDescription('Company Logo') ->setDescription('Company Logo')
->setPath(__DIR__ . '/logo.png') ->setPath(__DIR__ . '/logo.png')
->setHeight(50) ->setHeight(50)
->setOffsetX(880) ->setOffsetX(880)
->setOffsetY(650); ->setOffsetY(650);
$oSlide3->addShape($shape); $oSlide3->addShape($shape);
@ -301,10 +301,10 @@ $shape->createParagraph()->createTextRun('Internal APIs (everything from the Kar
$shape = new File(); $shape = new File();
$shape->setName('Company Logo') $shape->setName('Company Logo')
->setDescription('Company Logo') ->setDescription('Company Logo')
->setPath(__DIR__ . '/logo.png') ->setPath(__DIR__ . '/logo.png')
->setHeight(50) ->setHeight(50)
->setOffsetX(880) ->setOffsetX(880)
->setOffsetY(650); ->setOffsetY(650);
$oSlide4->addShape($shape); $oSlide4->addShape($shape);
@ -314,10 +314,10 @@ $oSlide5->setBackground($oBkgColor);
$shape = new File(); $shape = new File();
$shape->setName('Company Logo') $shape->setName('Company Logo')
->setDescription('Company Logo') ->setDescription('Company Logo')
->setPath(__DIR__ . '/logo.png') ->setPath(__DIR__ . '/logo.png')
->setHeight(300) ->setHeight(300)
->setOffsetX(320) ->setOffsetX(320)
->setOffsetY(120); ->setOffsetY(120);
$oSlide5->addShape($shape); $oSlide5->addShape($shape);