Skip to content

Commit

Permalink
📝 new version v5.0.0-alpha8
Browse files Browse the repository at this point in the history
  • Loading branch information
bjverde committed Jul 19, 2020
1 parent 2d1e53e commit 4aaed76
Show file tree
Hide file tree
Showing 15 changed files with 2,067 additions and 103 deletions.
32 changes: 7 additions & 25 deletions FormDin5/lib/widget/FormDin5/helpers/FormDinHelper.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,7 @@
class FormDinHelper
{

const FORMDIN_VERSION = '5.0.0-alpha7';

const DBMS_ACCESS = 'ACCESS';
const DBMS_FIREBIRD = 'ibase';
const DBMS_MYSQL = 'mysql';
const DBMS_ORACLE = 'oracle';
const DBMS_POSTGRES = 'pgsql';
const DBMS_SQLITE = 'sqlite';
const DBMS_SQLSERVER = 'sqlsrv';
const FORMDIN_VERSION = '5.0.0-alpha8';

/**
* Return FormDin version
Expand Down Expand Up @@ -111,20 +103,7 @@ public static function setFormDinMinimumVersion($minimumVersion) {
throw new DomainException($msg);
}
}
}

public static function getListDBMS()
{
$list = array();
//$list[self::DBMS_ACCESS]='Access';
//$list[self::DBMS_FIREBIRD]='FIREBIRD';
$list[self::DBMS_MYSQL]='MariaDB ou MySQL';
$list[self::DBMS_ORACLE]='Oracle';
$list[self::DBMS_POSTGRES]='PostgreSQL';
$list[self::DBMS_SQLITE]='SqLite';
$list[self::DBMS_SQLSERVER]='SQL Server';
return $list;
}
}


//--------------------------------------------------------------------------------
Expand Down Expand Up @@ -243,13 +222,16 @@ public static function issetOrNotZero($variable,$testZero=true)
return $result;
}


/**
* @codeCoverageIgnore
*/
public static function d( $mixExpression,$strComentario='Debug', $boolExit=FALSE )
{
return self::debug($mixExpression,$strComentario,$boolExit);
}

/***
/**
* @codeCoverageIgnore
* função para depuração. Exibe o modulo a linha e a variável/objeto solicitado
* Retirado do FormDin 4.9.0
* https://github.com/bjverde/formDin/blob/master/base/includes/funcoes.inc
Expand Down
8 changes: 6 additions & 2 deletions FormDin5/lib/widget/FormDin5/webform/TFormDin.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class TFormDin
{
const TYPE_FIELD = 'feild';
const TYPE_LAYOUT = 'layout';
const TYPE_HIDDEN = 'hidden';
protected $adiantiObj;
private $listFormElements = array();

Expand Down Expand Up @@ -251,7 +252,10 @@ public function getAdiantiObj2()
$adiantiObj = $this->adiantiObj;
call_user_func_array(array($adiantiObj, "addFields"), $fieldsRow);
$key = $fieldsRowResult['key'];
} elseif ($element['type']==self::TYPE_LAYOUT){
}elseif ($element['type']==self::TYPE_HIDDEN){
$adiantiObj = $this->adiantiObj;
$adiantiObj->addFields( [$element['obj']] );
}elseif ($element['type']==self::TYPE_LAYOUT){
$adiantiObj = $this->adiantiObj;
$adiantiObj->addContent( [$element['obj']] );
//call_user_func_array(array($adiantiObj, "addFields"), $fieldsRow);
Expand Down Expand Up @@ -620,7 +624,7 @@ public function addHiddenField(string $id
$formField = new TFormDinHiddenField($id,$strValue,$boolRequired);
$objField = $formField->getAdiantiObj();
//$this->adiantiObj->addFields([$objField]);
$this->addElementFormList($objField,self::TYPE_FIELD);
$this->addElementFormList($objField,self::TYPE_HIDDEN);
return $formField;
}

Expand Down
Loading

0 comments on commit 4aaed76

Please sign in to comment.