fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PM-3380

Browse Source 
campos checkbnox no renderiza en bachrouting

PM-3380
campos checkbnox no renderiza en bachrouting
This commit is contained in:
dheeyi
2015-09-02 13:05:13 -04:00
parent 409aea1d1a
commit 8f84f8e4fa
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -585,7 +585,7 @@ class ReportTables
if(!isset($aFields[$aField['sFieldName']])){ if(!isset($aFields[$aField['sFieldName']])){
foreach($aFields as $row){ foreach($aFields as $row){
if(is_array($row)){ if(is_array($row) && isset($row[count($row)])){
$aFields = $row[count($row)]; $aFields = $row[count($row)];
} }
} }
@@ -600,7 +600,12 @@ class ReportTables
if (! isset( $aFields[$aField['sFieldName']] )) { if (! isset( $aFields[$aField['sFieldName']] )) {
$aFields[$aField['sFieldName']] = ''; $aFields[$aField['sFieldName']] = '';
} }
$sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aFields[$aField['sFieldName']] ) : '') . "',";
if(is_array($aFields[$aField['sFieldName']])){
$sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? $aFields[$aField['sFieldName']][0] : '') . "',";
}else{
$sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aFields[$aField['sFieldName']] ) : '') . "',";
}
break; break;
case 'date': case 'date':
$mysqlDate = (isset( $aFields[$aField['sFieldName']] ) ? $aFields[$aField['sFieldName']] : ''); $mysqlDate = (isset( $aFields[$aField['sFieldName']] ) ? $aFields[$aField['sFieldName']] : '');

17
workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
View File

@@ -871,6 +871,23 @@ class Consolidated
$caseColumns[] = array("xtype" => "combocolumn", "gridId" => "gridId", "header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "align" => $align, "editor" => $editor, "frame" => "true", "clicksToEdit" => "1"); $caseColumns[] = array("xtype" => "combocolumn", "gridId" => "gridId", "header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "align" => $align, "editor" => $editor, "frame" => "true", "clicksToEdit" => "1");
$caseReaderFields[] = array("name" => $field->name); $caseReaderFields[] = array("name" => $field->name);
break; break;
case "checkbox":
$align = "center";
$size = 100;
if (isset($field->size)) {
$size = $field->size * 10;
}
$width = $size;
$dropList[] = $field->name;
$comboBoxYesNoList[] = $field->name;
$editor="* new Ext.form.Checkbox({ $fieldReadOnly $fieldRequired $fieldValidate cls: \"\"}) *";
$caseColumns[] = array("header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "align" => $align, "editor" => $editor, "frame" => true, "clicksToEdit" => 1, "sortable" => true);
$caseReaderFields[] = array("name" => $field->name);
break;
case "text": case "text":
default: default:
$align = "left"; $align = "left";