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

Merge branch 'master' of https://gitlab.com/printshopcreator/calc

Browse Source
This commit is contained in:
Thomas Peterson 2020-01-29 23:35:16 +00:00
commit 13aa6aa97c
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Calc/Calc.php
View File

@ -85,7 +85,11 @@ class Calc
if($collection->getName() == "opt") continue;
if($collection->getFormel() != "") {
$formel = $this->formelCalc->parse($collection->getFormel());
if(preg_match("/^[a-z](.*)/", $formel)) {
eval('$var = "' . $formel . '";');
}else{
eval('$var = ' . $formel . ';');
}
}else{
if(!isset($this->engine->getVariables()[$collection->getName()])) {
$var = 'XXXXXXXXXXXX';

5
src/Calc/CalcValues.php
View File

@ -90,7 +90,12 @@ class CalcValues
if($collection->getName() == "opt") continue;
if($collection->getFormel() != "") {
$formel = $this->formelCalc->parse($collection->getFormel());
if(preg_match("/^[a-z](.*)/", $formel)) {
eval('$var = "' . $formel . '";');
}else{
eval('$var = ' . $formel . ';');
}
}else{
if(!isset($this->engine->getVariables()[$collection->getName()])) {
$var = 'XXXXXXXX';

4
src/Option/Type/Template.php
View File

@ -12,7 +12,7 @@ class Template extends Base
/**
* @return String
*/
public function getSelect(): String
public function getSelect()
{
return $this->select;
}
@ -20,7 +20,7 @@ class Template extends Base
/**
* @param String $select
*/
public function setSelect(String $select): void
public function setSelect($select)
{
$this->select = $select;
}

4
tests/Customer/A/formels.txt
View File

@ -693,10 +693,10 @@ if(!function_exists('getSammelformMengenAbschlagPlano')) {
function getMaschine($breite, $hoehe) {
if($breite > 49 || $hoehe > 49) {
return '"kba"';
return 'kba';
}
return '"gto"';
return 'gto';
}
function getGeiferRand($format) {