fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in 3.1 (pull request #4450)

Browse Source 
Updating branch with changes to 2016-06-23 11:35
This commit is contained in:
Julio Cesar Laura Avendaño
2016-06-23 11:17:01 -04:00
parent 4dfbb5d931 320b2427a1
commit 7cbc64996a
7 changed files with 315 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
workflow/engine/classes/class.pmDynaform.php
View File

@@ -1599,4 +1599,57 @@ class pmDynaform
return (string) $value;
}
/**
* Get grids and fields
*
* @param mixed $form
* @param bool $flagGridAssocToVar
*
* @return array Return an array, FALSE otherwise
*/
public static function getGridsAndFields($form, $flagGridAssocToVar = true)
{
try {
if (!is_object($form)) {
//This code it runs only in the first call to the method
$object = \ProcessMaker\Util\Common::stringToJson($form);
if ($object !== false) {
$form = $object->items[0];
} else {
return false;
}
}
$arrayGrid = [];
foreach ($form->items as $value) {
foreach ($value as $value2) {
$field = $value2;
if (isset($field->type)) {
switch ($field->type) {
case 'grid':
$flagInsert = ($flagGridAssocToVar)? (isset($field->var_uid) && $field->var_uid != '' && isset($field->variable) && $field->variable != '') : true;
if ($flagInsert) {
$arrayGrid[$field->id] = $field;
}
break;
case 'form':
$arrayGrid = array_merge(
$arrayGrid, $this->getGridsAndFields($field, $flagGridAssocToVar)
);
break;
}
}
}
}
//Return
return $arrayGrid;
} catch (Exception $e) {
throw $e;
}
}
}

11
workflow/engine/classes/class.reportTables.php
View File

@@ -611,18 +611,11 @@ class ReportTables
}
if (! isset( $aFields[$aField['sFieldName'] . '_label'] )) {
$aFields[$aField['sFieldName'] . '_label'] = '';
}
}
if(is_array($aFields[$aField['sFieldName']])){
$sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? $aFields[$aField['sFieldName']][0] : '') . "',";
}else{
if (!isset($aFields[$aField['sFieldName'] . '_label'])) {
$aFields[$aField['sFieldName'].'_label'] = '';
}
if($aFields[$aField['sFieldName']] == $aFields[$aField['sFieldName'].'_label']){
$sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aFields[$aField['sFieldName']] ) : '') . "',";
}else{
$sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aFields[$aField['sFieldName'].'_label'] ) : '') . "',";
}
$sQuery .= '\'' . ((isset($aFields[$aField['sFieldName']]))? @mysql_real_escape_string($aFields[$aField['sFieldName']]) : '') . '\',';
}
break;
case 'date':

4
workflow/engine/classes/model/Process.php
View File

@@ -296,8 +296,6 @@ class Process extends BaseProcess
public function getAll ()
{
$bpmn = new \ProcessMaker\Project\Bpmn();
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
@@ -320,7 +318,7 @@ class Process extends BaseProcess
$uids = array ();
while ($oDataset->next()) {
$row = $oDataset->getRow();
$row['PRO_PROCESS_TYPE'] = ($bpmn->exists($row['PRO_UID']))? 'BPMN' : 'CLASSIC';
$processes[] = $row;
$uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID'];
}

7
workflow/engine/controllers/pmTables.php
View File

@@ -113,13 +113,6 @@ class pmTables extends Controller
$this->setJSVar( '_plugin_permissions', $repTabPluginPermissions );
$this->setJSVar( 'sizeTableName', $this->getSizeTableName());
$isBpmn = 0;
if (isset( $_GET['PRO_UID'] )) {
$process = new Process();
$isBpmn = $process->isBpmnProcess($_GET['PRO_UID']);
}
$this->setJSVar( 'isBpmn', $isBpmn );
G::RenderPage( 'publish', 'extJs' );
}

298
workflow/engine/controllers/pmTablesProxy.php
View File

File diff suppressed because it is too large Load Diff

18
workflow/engine/src/ProcessMaker/Util/Common.php
View File

@@ -136,5 +136,23 @@ class Common extends \Maveriks\Util\Common
return $sCode;
}
/**
* Convert string to JSON
*
* @param string $string
*
* @return object Returns an object, FALSE otherwise
*/
public static function stringToJson($string)
{
try {
$object = json_decode($string);
return (json_last_error() == JSON_ERROR_NONE)? $object : false;
} catch (\Exception $e) {
throw $e;
}
}
}

61
workflow/engine/templates/pmTables/editReport.js
View File

@@ -43,6 +43,21 @@ Ext.onReady(function(){
]
}),
listeners: {
beforeload: function (store, options)
{
var p = {PRO_UID: (PRO_UID !== false)? PRO_UID : Ext.getCmp("PROCESS").getValue()};
if (Ext.getCmp("REP_TAB_TYPE").getValue() == "GRID" && Ext.getCmp("REP_TAB_GRID").getValue() != "") {
p.TYPE = "GRID";
p.GRID_UID = Ext.getCmp("REP_TAB_GRID").getValue();
}
if (Ext.getCmp("searchTxt").getValue() != "") {
p.textFilter = Ext.getCmp("searchTxt").getValue();
}
this.baseParams = p;
},
load: function() {
Ext.getCmp('availableGrid').store.sort();
storeA.setBaseParam('PRO_UID', (PRO_UID !== false? PRO_UID : Ext.getCmp('PROCESS').getValue()));
@@ -721,9 +736,6 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
}
});
var arrayBpmnTypeData = [["NORMAL", _("ID_GLOBAL")]];
var arrayClassicTypeData = [["NORMAL", _("ID_GLOBAL")], ["GRID", _("ID_GRID")]];
var types = new Ext.data.ArrayStore({
storeId: "types",
autoDestroy: true,
@@ -866,7 +878,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
valueField : 'FIELD_UID',
displayField : 'FIELD_NAME',
triggerAction : 'all',
width: 120,
width: 200,
editable : false,
mode:'local',
listeners:{
@@ -884,8 +896,6 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
}
});
comboReport.setDisabled(isBpmn);
processStore = new Ext.data.Store( {
autoLoad: true,
proxy : new Ext.data.HttpProxy({
@@ -896,7 +906,7 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
action: 'getProcessList'
},
reader : new Ext.data.JsonReader( {
fields : [{name : 'PRO_UID'}, {name : 'PRO_TITLE'},{name : 'PRO_DESCRIPTION'}, {name: "PRO_PROCESS_TYPE"}]
fields: [{name: "PRO_UID"}, {name: "PRO_TITLE"}, {name: "PRO_DESCRIPTION"}]
}),
listeners: {
load: function() {
@@ -940,7 +950,6 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
}
});
var rptPosArray = 0;
processComboBox = new Ext.form.ComboBox({
id: 'PROCESS',
fieldLabel : _("ID_CASESLIST_APP_PRO_TITLE"),
@@ -960,21 +969,11 @@ function validateFieldSizeAutoincrement(valueType, defaultValue) {
listeners:{
select: function(){
var dataStore = Ext.getCmp('PROCESS').store.getRange();
var i = Ext.getCmp('PROCESS').store.find("PRO_UID", Ext.getCmp('PROCESS').getValue());
var dataStoreAux = types.getRange(0);
comboReport.setValue(dataStoreAux[0].data.REP_TAB_TYPE);
comboGridsList.setVisible(false);
types.loadData(
(dataStore[i].data.PRO_PROCESS_TYPE == "BPMN")? arrayBpmnTypeData : arrayClassicTypeData, false
);
var dataStoreAux = types.getRange(rptPosArray);
comboReport.setValue(dataStoreAux[0].data.REP_TAB_TYPE);
comboReport.setDisabled(dataStore[i].data.PRO_PROCESS_TYPE === "BPMN");
comboGridsList.setVisible(false);
comboDbConnections.getStore().reload({params:{PRO_UID : Ext.getCmp('PROCESS').getValue()}});
comboDbConnections.getStore().reload({params: {PRO_UID: Ext.getCmp("PROCESS").getValue()}});
if (Ext.getCmp('REP_TAB_TYPE').getValue() == 'GRID') {
gridsListStore.reload({params:{PRO_UID : Ext.getCmp('PROCESS').getValue()}});
} else {
@@ -1409,7 +1408,8 @@ loadFieldNormal = function(){
action: "getDynafields",
PRO_UID: PRO_UID !== false ? PRO_UID : Ext.getCmp('PROCESS').getValue(),
start: 0,
limit: pageSize
limit: pageSize,
loadField: 1
}
});
var assignedGridGotData = Ext.getCmp('assignedGrid').getStore().getCount() > 0;
@@ -1433,7 +1433,8 @@ loadFieldsGrids = function(){
TYPE: 'GRID',
GRID_UID: Ext.getCmp('REP_TAB_GRID').getValue(),
start: 0,
limit: pageSize
limit: pageSize,
loadField: 1
}
});
@@ -1538,8 +1539,10 @@ function setReportFields(records) {
isset : false
},
success: function(resp){
result = Ext.util.JSON.decode(resp.responseText);
availableGrid.store.reload();
result = Ext.util.JSON.decode(resp.responseText);
availableGrid.store.lastOptions.params.loadField = 0;
availableGrid.store.reload();
}
});
}
@@ -1603,8 +1606,10 @@ function unsetReportFields(records) {
isset : true
},
success: function(resp){
result = Ext.util.JSON.decode(resp.responseText);
availableGrid.store.reload();
result = Ext.util.JSON.decode(resp.responseText);
availableGrid.store.lastOptions.params.loadField = 0;
availableGrid.store.reload();
}
});
}