Radiobox

src/Engine.php

@@ -1,7 +1,7 @@
 <?php
 namespace PSC\Library\Calc;
 
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectRepository;
 use PSC\Library\Calc\Calc\Calc;
 use PSC\Library\Calc\Calc\CalcValues;
 use PSC\Library\Calc\Calc\Valid;

src/Option/Parser/Checkbox.php

@@ -1,7 +1,6 @@
 <?php
 namespace PSC\Library\Calc\Option\Parser;
 
-use Doctrine\Common\Persistence\ObjectRepository;
 use PSC\Library\Calc\General\Parser\EdgeCollectionContainer;
 use PSC\Library\Calc\Option\Parser\Checkbox\Opt;
 use PSC\Library\Calc\PaperContainer;

src/Option/Parser/Radio.php

@@ -1,7 +1,7 @@
 <?php
 namespace PSC\Library\Calc\Option\Parser;
 
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectRepository;
 use PSC\Library\Calc\General\Parser\EdgeCollectionContainer;
 use PSC\Library\Calc\Option\Parser\Select\Opt;
 use PSC\Library\Calc\PaperContainer;

src/Option/Parser/Select.php

@@ -1,7 +1,7 @@
 <?php
 namespace PSC\Library\Calc\Option\Parser;
 
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectRepository;
 use PSC\Library\Calc\General\Parser\EdgeCollectionContainer;
 use PSC\Library\Calc\Option\Parser\Select\Opt;
 use PSC\Library\Calc\PaperContainer;

src/Option/Type/Radio.php

@@ -27,9 +27,13 @@ class Radio extends Base
      */
     public function processValue()
     {
-        $option = $this->getSelectedOption();
+        if($this->rawValue != "") {
-        if($option) {
+            /** @var \PSC\Library\Calc\Option\Type\Radio\Opt $item */
-            $this->setValue($option->getLabel());
+            foreach($this->options as $item) {
+                if($item->getId() == $this->rawValue) {
+                    $item->setIsSelected(true);
+                }
+            }
         }
     }
 
@@ -49,4 +53,9 @@ class Radio extends Base
         }
     }
 
+    public function getValue()
+    {
+        return $this->getSelectedOption()->getLabel();
+    }
+
 }

src/Parser.php

@@ -2,7 +2,7 @@
 namespace PSC\Library\Calc;
 
 
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectRepository;
 use PSC\Library\Calc\Option\Parser\Select;
 use PSC\Library\Calc\Option\Parser\Template;
 

tests/Customer/K/CalcTest.php

@@ -41,6 +41,5 @@ class CalcTest extends \PHPUnit_Framework_TestCase
         $this->engine->setVariable('anz_ausfuhren', 2500);
         /** @var Select $option */
         $option = $this->engine->getArticle()->getOptionById('tarif');
-        var_dump($option->getSelectedOption());
     }
 }

tests/Customer/M/CalcTest.php

@@ -0,0 +1,53 @@
+<?php
+namespace PSC\Library\Calc\Tests\Customer\M;
+
+use PSC\Library\Calc\Article;
+use PSC\Library\Calc\Engine;
+use PSC\Library\Calc\Option\Type\Select;
+use PSC\Library\Calc\PaperContainer;
+use PSC\Library\Calc\Tests\Mock\PaperRepostory;
+
+class CalcTest extends \PHPUnit_Framework_TestCase
+{
+
+    /** @var Engine */
+    protected $engine = null;
+
+    public function setUp()
+    {
+        $repository = new PaperRepostory();
+
+        $paperContainer = new PaperContainer();
+        $paperContainer->parse(simplexml_load_string(file_get_contents(__DIR__ . '/papierContainer.xml')));
+
+        $this->engine = new Engine();
+        $this->engine->setPaperContainer($paperContainer);
+        $this->engine->setPaperRepository($repository);
+        $this->engine->setFormulas(file_get_contents(__DIR__ . '/formels.txt'));
+        $this->engine->setParameters(file_get_contents(__DIR__ . '/parameters.txt'));
+        $this->engine->setTemplates(file_get_contents(__DIR__ . '/calcTemplates.xml'));
+
+        $this->engine->loadString(file_get_contents(__DIR__ . '/calc.xml'));
+
+    }
+
+    public function tearDown()
+    {
+        $this->engine = null;
+    }
+
+    public function testDefaultOption()
+    {
+        $article = $this->engine->getArticle();
+        $option = $article->getOptionById('lochbohrung');
+        $this->assertEquals("ohne Lochbohrung", $option->getValue());
+    }
+
+    public function testCalcValues()
+    {
+        $this->engine->setVariable('lochbohrung', 1);
+        $article = $this->engine->getArticle();
+        $option = $article->getOptionById('lochbohrung');
+        $this->assertEquals("mit Lochbohrung (+2,50 Euro/Stück)", $option->getValue());
+    }
+}

tests/Customer/M/calc.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<kalkulation>
+    <artikel>
+        <name>Kalkulation EduPlaner</name>
+        <kommentar>Gratis Schulplaner</kommentar>
+        <uploads>
+            <upload id="neutral" name="Druckdaten" description="Bitte laden sie eine PDF für den Druck hoch"/>
+        </uploads>
+
+        <option id="auflage" name="Auflage" type="Input" width="3" require="true" default="1">
+            <auflage>
+                <grenze formel="(10*5)">1-</grenze>
+            </auflage>
+        </option>
+
+        <option id="lochbohrung" name="Lochbohrung in den Ecken" type="Radio" default="2">
+            <opt id="2" name="ohne Lochbohrung"/>
+            <opt id="1" name="mit Lochbohrung (+2,50 Euro/Stück)"/>
+        </option>
+
+
+    </artikel>
+</kalkulation>

tests/Customer/M/calcTemplates.xml

@@ -0,0 +1,2 @@
+<root>
+</root>

tests/Customer/M/papierContainer.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container>
+
+</container>

tests/Mock/PaperRepostory.php

@@ -11,7 +11,7 @@
  */
 namespace PSC\Library\Calc\Tests\Mock;
 
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectRepository;
 
 class PaperRepostory implements ObjectRepository
 {

tests/Parse/Option/RadioboxTest.php

@@ -0,0 +1,23 @@
+<?php
+namespace PSC\Library\Calc\Tests\Option\Type;
+
+use PSC\Library\Calc\Option\Parser;
+use PSC\Library\Calc\Option\Type\Checkbox;
+use PSC\Library\Calc\Option\Type\Input;
+use PSC\Library\Calc\PaperContainer\Container;
+
+class RadioboxTest extends \PHPUnit_Framework_TestCase
+{
+    public function testIfCorrectType()
+    {
+        $parser = new Parser();
+        /** @var Parser\Checkbox $obj */
+        $obj = $parser->getOptByType(simplexml_load_string(file_get_contents(__DIR__ . '/../../TestFiles/Option/radiobox.xml')));
+
+        /** @var Checkbox $element */
+        $element = $obj->parse();
+
+        $this->assertInstanceOf('PSC\Library\Calc\Option\Type\Radio', $element);
+    }
+
+}

tests/TestFiles/Option/radiobox.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<option id="lochbohrung" name="Lochbohrung in den Ecken" type="Radio" default="2">
+    <opt id="2" name="ohne Lochbohrung"/>
+    <opt id="1" name="mit Lochbohrung (+2,50 Euro/Stück)"/>
+</option>