boonkerz/calc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Thomas Peterson 2025-07-18 12:01:18 +02:00
parent 9b14dedec0
commit 017a7931b3
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Option/Type/ColorDBSelect.php
View File

@ -1,4 +1,5 @@
<?php <?php
namespace PSC\Library\Calc\Option\Type; namespace PSC\Library\Calc\Option\Type;
use PSC\Library\Calc\Option\Type\Select\Opt; use PSC\Library\Calc\Option\Type\Select\Opt;
@ -7,7 +8,7 @@ use PSC\Library\Calc\Tests\Mock\Paper;
class ColorDBSelect extends Select class ColorDBSelect extends Select
{ {
private string $colorSystem = ""; private string $colorSystem = '';
public function getColorSystem(): string public function getColorSystem(): string
{ {
@ -24,17 +25,16 @@ class ColorDBSelect extends Select
$obj = parent::generateJson(); $obj = parent::generateJson();
$obj->mode = 'colordb'; $obj->mode = 'colordb';
$obj->container = $this->container; $obj->container = $this->container;
$obj->options = [];
$obj->options[] = $this->getSelectedOption()->generateJson();
return $obj; return $obj;
} }
public function generateXML(): array public function generateXML(): array
{ {
return array_merge_recursive( return array_merge_recursive(parent::generateXML(), ['_attributes' => [
parent::generateXML(), 'mode' => 'colordb',
['_attributes' => ['mode' => 'colordb', 'container' => $this->container]]); 'container' => $this->container,
]]);
} }
} }

33
src/Option/Type/PaperDbSelect.php
View File

@ -1,4 +1,5 @@
<?php <?php
namespace PSC\Library\Calc\Option\Type; namespace PSC\Library\Calc\Option\Type;
use PSC\Library\Calc\Option\Type\Select\Opt; use PSC\Library\Calc\Option\Type\Select\Opt;
@ -9,14 +10,16 @@ class PaperDbSelect extends Select
{ {
protected $newPaperObject = null; protected $newPaperObject = null;
public function getSelectedOption(): ?Opt public function getSelectedOption(): null|Opt
{ {
if (count($this->selectedOptions) > 0) {
if(count($this->selectedOptions) > 0) {
return $this->selectedOptions[0]; return $this->selectedOptions[0];
} }
if(isset($this->savedCalcValues[$this->getId()]) && $this->savedCalcValues[$this->getId()]['art_nr'] == $this->getRawValue()) { if (
isset($this->savedCalcValues[$this->getId()]) &&
$this->savedCalcValues[$this->getId()]['art_nr'] == $this->getRawValue()
) {
$opt = new PaperOpt(); $opt = new PaperOpt();
$opt->setId($this->savedCalcValues[$this->getId()]['art_nr']); $opt->setId($this->savedCalcValues[$this->getId()]['art_nr']);
$opt->setLabel($this->savedCalcValues[$this->getId()]['description_1']); $opt->setLabel($this->savedCalcValues[$this->getId()]['description_1']);
@ -51,8 +54,7 @@ class PaperDbSelect extends Select
/** @var PaperOpt $option */ /** @var PaperOpt $option */
$option = $this->getSelectedOption(); $option = $this->getSelectedOption();
if($option == null) { if ($option == null) {
$variables[$this->getId() . '_grammatur'] = 0; $variables[$this->getId() . '_grammatur'] = 0;
$variables[$this->getId() . '_art_nr'] = 0; $variables[$this->getId() . '_art_nr'] = 0;
$variables[$this->getId() . '_volume'] = 0; $variables[$this->getId() . '_volume'] = 0;
@ -102,9 +104,7 @@ class PaperDbSelect extends Select
$variables[$this->getId() . '_glam'] = 0; $variables[$this->getId() . '_glam'] = 0;
$variables[$this->getId() . '_post'] = 0; $variables[$this->getId() . '_post'] = 0;
$variables[$this->getId() . '_sammelform'] = 0; $variables[$this->getId() . '_sammelform'] = 0;
} else {
}else {
/** @var Paper $paper */ /** @var Paper $paper */
$paper = $option->getPaper(); $paper = $option->getPaper();
@ -112,7 +112,7 @@ class PaperDbSelect extends Select
$variables[$this->getId() . '_art_nr'] = $paper->getArtNr(); $variables[$this->getId() . '_art_nr'] = $paper->getArtNr();
$variables[$this->getId() . '_volume'] = $paper->getVolume(); $variables[$this->getId() . '_volume'] = $paper->getVolume();
$variables[$this->getId() . '_value'] = $paper->getPreis(); $variables[$this->getId() . '_value'] = $paper->getPreis();
if($option->getValue() > 0) { if ($option->getValue() > 0) {
$variables[$this->getId() . '_value'] = $option->getValue(); $variables[$this->getId() . '_value'] = $option->getValue();
} }
$variables[$this->getId() . '_offset_fix'] = $paper->getOffsetFix(); $variables[$this->getId() . '_offset_fix'] = $paper->getOffsetFix();
@ -160,7 +160,6 @@ class PaperDbSelect extends Select
$variables[$this->getId() . '_glam'] = $paper->getGlam(); $variables[$this->getId() . '_glam'] = $paper->getGlam();
$variables[$this->getId() . '_post'] = $paper->getPost(); $variables[$this->getId() . '_post'] = $paper->getPost();
$variables[$this->getId() . '_sammelform'] = $paper->getSammelform(); $variables[$this->getId() . '_sammelform'] = $paper->getSammelform();
} }
return $variables; return $variables;
@ -176,19 +175,19 @@ class PaperDbSelect extends Select
public function generateXML(): array public function generateXML(): array
{ {
return array_merge_recursive( return array_merge_recursive(parent::generateXML(), ['_attributes' => [
parent::generateXML(), 'mode' => 'papierdb',
['_attributes' => ['mode' => 'papierdb', 'container' => $this->container]]); 'container' => $this->container,
]]);
} }
public function generateJson(): \stdClass public function generateJson(): \stdClass
{ {
$obj = parent::generateJson(); $obj = parent::generateJson();
$obj->mode = 'papierdb'; $obj->mode = 'papierdb';
$obj->container = $this->container; $obj->container = $this->container;
$obj->options = [];
$obj->options[] = $this->getSelectedOption()->generateJson();
return $obj; return $obj;
} }
} }