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

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Marco Antonio Nina
2013-03-19 10:20:49 -04:00
parent be174d0eed 0c845cc5b1
commit 4677b8588b
6 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/classes/model/OutputDocument.php
View File

@@ -858,7 +858,6 @@ class OutputDocument extends BaseOutputDocument
} }
$doc = new DOMDocument('1.0', 'UTF-8'); $doc = new DOMDocument('1.0', 'UTF-8');
$doc->loadHtml($sContent); $doc->loadHtml($sContent);
$doc->encoding = 'UTF-8';
$pdf->writeHTML($doc->saveXML(), false, false, false, false, ''); $pdf->writeHTML($doc->saveXML(), false, false, false, false, '');
// --------------------------------------------------------- // ---------------------------------------------------------
// Close and output PDF document // Close and output PDF document

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

@@ -109,6 +109,7 @@ class pmTables extends Controller
$this->setJSVar( 'columnsTypes', $columnsTypesList ); $this->setJSVar( 'columnsTypes', $columnsTypesList );
$this->setJSVar( 'dataNumRows', $dataNumRows ); $this->setJSVar( 'dataNumRows', $dataNumRows );
$this->setJSVar( '_plugin_permissions', $repTabPluginPermissions ); $this->setJSVar( '_plugin_permissions', $repTabPluginPermissions );
$this->setJSVar( 'sizeTableName', $this->getSizeTableName());
G::RenderPage( 'publish', 'extJs' ); G::RenderPage( 'publish', 'extJs' );
} }
@@ -180,5 +181,29 @@ class pmTables extends Controller
} }
return $repTabPluginPermissions; return $repTabPluginPermissions;
} }
/**
*
* Return of size ok the engine on course.
*
* @return int
*/
public function getSizeTableName()
{
switch (DB_ADAPTER) {
case 'mysql':
$tableSize = 64;
break;
case 'mssql':
$tableSize = 128;
break;
case 'oci8':
$tableSize = 30;
default:
$tableSize = 30;
break;
}
$tableSize = $tableSize - 4; // Prefix PMT_
return $tableSize;
}
} }

3
workflow/engine/templates/pmTables/edit.js
View File

@@ -547,10 +547,11 @@ Ext.onReady(function(){
xtype:'textfield', xtype:'textfield',
emptyText: _("ID_SET_A_TABLE_NAME"), emptyText: _("ID_SET_A_TABLE_NAME"),
width: 250, width: 250,
autoCreate: {tag: "input", type: "text", autocomplete: "off", maxlength: sizeTableName },
stripCharsRe: /(\W+)/g, stripCharsRe: /(\W+)/g,
listeners:{ listeners:{
change: function(){ change: function(){
this.setValue(this.getValue().toUpperCase()) this.setValue(this.getValue().toUpperCase());
} }
} }
}); });

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

@@ -802,6 +802,7 @@ Ext.onReady(function(){
xtype:'textfield', xtype:'textfield',
emptyText: _("ID_SET_A_TABLE_NAME"), emptyText: _("ID_SET_A_TABLE_NAME"),
width: 250, width: 250,
autoCreate: {tag: "input", type: "text", autocomplete: "off", maxlength: sizeTableName },
stripCharsRe: /(\W+)/g, stripCharsRe: /(\W+)/g,
listeners:{ listeners:{
change: function(){ change: function(){

46
workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
View File

@@ -11,87 +11,87 @@
</saveasDyna> </saveasDyna>
<!--.--> <!--.-->
<separator2 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator2 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<text type="toolButton" class="ss_sprite button_toolbar ss_textfield" onclick="fieldsAdd('text')" buttonType="class"> <text type="toolButton" class="ss_sprite button_toolbar ss_textfield" onclick="fieldsAdd('text');return false;" buttonType="class">
<en>Text field</en> <en>Text field</en>
</text> </text>
<currency type="toolButton" class="ss_sprite button_toolbar ss_textfield_currency" onclick="fieldsAdd('currency')" buttonType="class"> <currency type="toolButton" class="ss_sprite button_toolbar ss_textfield_currency" onclick="fieldsAdd('currency');return false;" buttonType="class">
<en>Currency</en> <en>Currency</en>
</currency> </currency>
<percentage type="toolButton" class="ss_sprite button_toolbar ss_textfield_percentage" onclick="fieldsAdd('percentage')" buttonType="class"> <percentage type="toolButton" class="ss_sprite button_toolbar ss_textfield_percentage" onclick="fieldsAdd('percentage');return false;" buttonType="class">
<en>Percentage</en> <en>Percentage</en>
</percentage> </percentage>
<password type="toolButton" class="ss_sprite button_toolbar ss_textfield_key" onclick="fieldsAdd('password')" buttonType="class"> <password type="toolButton" class="ss_sprite button_toolbar ss_textfield_key" onclick="fieldsAdd('password');return false;" buttonType="class">
<en>Password</en> <en>Password</en>
</password> </password>
<suggest type="toolButton" class="ss_sprite button_toolbar ss_lightbulb" onclick="fieldsAdd('suggest')" buttonType="class"> <suggest type="toolButton" class="ss_sprite button_toolbar ss_lightbulb" onclick="fieldsAdd('suggest');return false;" buttonType="class">
<en>Suggest</en> <en>Suggest</en>
</suggest> </suggest>
<textarea type="toolButton" class="ss_sprite button_toolbar ss_textarea" onclick="fieldsAdd('textarea')" buttonType="class"> <textarea type="toolButton" class="ss_sprite button_toolbar ss_textarea" onclick="fieldsAdd('textarea');return false;" buttonType="class">
<en>TextArea</en> <en>TextArea</en>
</textarea> </textarea>
<!--.--> <!--.-->
<separator3 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator3 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<title type="toolButton" class="ss_sprite button_toolbar ss_title" onclick="fieldsAdd('title')" buttonType="class"> <title type="toolButton" class="ss_sprite button_toolbar ss_title" onclick="fieldsAdd('title');return false;" buttonType="class">
<en>Title</en> <en>Title</en>
</title> </title>
<subtitle type="toolButton" class="ss_sprite button_toolbar ss_subtitle" onclick="fieldsAdd('subtitle')" buttonType="class"> <subtitle type="toolButton" class="ss_sprite button_toolbar ss_subtitle" onclick="fieldsAdd('subtitle');return false;" buttonType="class">
<en>Subtitle</en> <en>Subtitle</en>
</subtitle> </subtitle>
<!--.--> <!--.-->
<separator4 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator4 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<button type="toolButton" class="ss_sprite button_toolbar ss_button" onclick="fieldsAdd('button')" buttonType="class"> <button type="toolButton" class="ss_sprite button_toolbar ss_button" onclick="fieldsAdd('button');return false;" buttonType="class">
<en>Button</en> <en>Button</en>
</button> </button>
<submit type="toolButton" class="ss_sprite button_toolbar ss_submit" onclick="fieldsAdd('submit')" buttonType="class"> <submit type="toolButton" class="ss_sprite button_toolbar ss_submit" onclick="fieldsAdd('submit');return false;" buttonType="class">
<en>Submit</en> <en>Submit</en>
</submit> </submit>
<reset type="toolButton" class="ss_sprite button_toolbar ss_reset" onclick="fieldsAdd('reset')" buttonType="class"> <reset type="toolButton" class="ss_sprite button_toolbar ss_reset" onclick="fieldsAdd('reset');return false;" buttonType="class">
<en>Reset</en> <en>Reset</en>
</reset> </reset>
<!--.--> <!--.-->
<separator5 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator5 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<dropdown type="toolButton" class="ss_sprite button_toolbar ss_dropdown" onclick="fieldsAdd('dropdown')" buttonType="class"> <dropdown type="toolButton" class="ss_sprite button_toolbar ss_dropdown" onclick="fieldsAdd('dropdown');return false;" buttonType="class">
<en>Dropdown</en> <en>Dropdown</en>
</dropdown> </dropdown>
<yesno type="toolButton" class="ss_sprite button_toolbar ss_yesno" onclick="fieldsAdd('yesno')" buttonType="class"> <yesno type="toolButton" class="ss_sprite button_toolbar ss_yesno" onclick="fieldsAdd('yesno');return false;" buttonType="class">
<en>Yes/No</en> <en>Yes/No</en>
</yesno> </yesno>
<listbox type="toolButton" class="ss_sprite button_toolbar ss_listbox" onclick="fieldsAdd('listbox')" buttonType="class"> <listbox type="toolButton" class="ss_sprite button_toolbar ss_listbox" onclick="fieldsAdd('listbox');return false;" buttonType="class">
<en>Listbox</en> <en>Listbox</en>
</listbox> </listbox>
<!--.--> <!--.-->
<separator6 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator6 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<checkbox type="toolButton" class="ss_sprite button_toolbar ss_check" onclick="fieldsAdd('checkbox')" buttonType="class"> <checkbox type="toolButton" class="ss_sprite button_toolbar ss_check" onclick="fieldsAdd('checkbox');return false;" buttonType="class">
<en>Checkbox</en> <en>Checkbox</en>
</checkbox> </checkbox>
<checkgroup type="toolButton" class="ss_sprite button_toolbar ss_checkgroup" onclick="fieldsAdd('checkgroup')" buttonType="class"> <checkgroup type="toolButton" class="ss_sprite button_toolbar ss_checkgroup" onclick="fieldsAdd('checkgroup');return false;" buttonType="class">
<en>CheckGroup</en> <en>CheckGroup</en>
</checkgroup> </checkgroup>
<radiogroup type="toolButton" class="ss_sprite button_toolbar ss_radiogroup" onclick="fieldsAdd('radiogroup')" buttonType="class"> <radiogroup type="toolButton" class="ss_sprite button_toolbar ss_radiogroup" onclick="fieldsAdd('radiogroup');return false;" buttonType="class">
<en>RadioGroup</en> <en>RadioGroup</en>
</radiogroup> </radiogroup>
<!--.--> <!--.-->
<separator7 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator7 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<date type="toolButton" class="ss_sprite button_toolbar ss_date" onclick="fieldsAdd('date')" buttonType="class"> <date type="toolButton" class="ss_sprite button_toolbar ss_date" onclick="fieldsAdd('date');return false;" buttonType="class">
<en>Date</en> <en>Date</en>
</date> </date>
<hidden type="toolButton" class="ss_sprite button_toolbar ss_hidden" onclick="fieldsAdd('hidden')" buttonType="class"> <hidden type="toolButton" class="ss_sprite button_toolbar ss_hidden" onclick="fieldsAdd('hidden');return false;" buttonType="class">
<en>Hidden</en> <en>Hidden</en>
</hidden> </hidden>
<link type="toolButton" class="ss_sprite button_toolbar ss_link" onclick="fieldsAdd('link')" buttonType="class"> <link type="toolButton" class="ss_sprite button_toolbar ss_link" onclick="fieldsAdd('link');return false;" buttonType="class">
<en>Link</en> <en>Link</en>
</link> </link>
<file type="toolButton" class="ss_sprite button_toolbar ss_upload" onclick="fieldsAdd('file')" buttonType="class"> <file type="toolButton" class="ss_sprite button_toolbar ss_upload" onclick="fieldsAdd('file');return false;" buttonType="class">
<en>File</en> <en>File</en>
</file> </file>
<!--.--> <!--.-->
<separator8 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator8 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<javascript type="toolButton" class="ss_sprite button_toolbar ss_js" onclick="fieldsAdd('javascript')" buttonType="class"> <javascript type="toolButton" class="ss_sprite button_toolbar ss_js" onclick="fieldsAdd('javascript');return false;" buttonType="class">
<en>Javascript</en> <en>Javascript</en>
</javascript> </javascript>
<!--.--> <!--.-->
<separator9 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator9 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<grid type="toolButton" class="ss_sprite button_toolbar ss_table" onclick="fieldsAdd('grid')" buttonType="class"> <grid type="toolButton" class="ss_sprite button_toolbar ss_table" onclick="fieldsAdd('grid');return false;" buttonType="class">
<en>Grid</en> <en>Grid</en>
</grid> </grid>
<separator10 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator10 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>

26
workflow/engine/xmlform/dynaforms/fields_ToolbarGrid.xml
View File

@@ -11,47 +11,47 @@
</saveasDyna> </saveasDyna>
<!--.--> <!--.-->
<separator3 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator3 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<text type="toolButton" onclick="fieldsAdd('text')" class="ss_sprite button_toolbar ss_textfield" buttonType="class"> <text type="toolButton" onclick="fieldsAdd('text');return false;" class="ss_sprite button_toolbar ss_textfield" buttonType="class">
<en>Text field</en> <en>Text field</en>
</text> </text>
<currency type="toolButton" class="ss_sprite button_toolbar ss_textfield_currency" onclick="fieldsAdd('currency')" buttonType="class"> <currency type="toolButton" class="ss_sprite button_toolbar ss_textfield_currency" onclick="fieldsAdd('currency');return false;" buttonType="class">
<en>Currency</en> <en>Currency</en>
</currency> </currency>
<percentage type="toolButton" class="ss_sprite button_toolbar ss_textfield_percentage" onclick="fieldsAdd('percentage')" buttonType="class"> <percentage type="toolButton" class="ss_sprite button_toolbar ss_textfield_percentage" onclick="fieldsAdd('percentage');return false;" buttonType="class">
<en>Percentage</en> <en>Percentage</en>
</percentage> </percentage>
<!--<password type="toolButton" onclick="fieldsAdd('password')" file="images/dynamicForm/password.gif" fileAlt="images/dynamicForm/hover.gif" home="public_html" style="height:18px;width:18px;" buttonType="html"> <!--<password type="toolButton" onclick="fieldsAdd('password');return false;" file="images/dynamicForm/password.gif" fileAlt="images/dynamicForm/hover.gif" home="public_html" style="height:18px;width:18px;" buttonType="html">
<en><![CDATA[<div class="ss_sprite button_toolbar ss_textfield_key" title="Password"></div>]]></en> <en><![CDATA[<div class="ss_sprite button_toolbar ss_textfield_key" title="Password"></div>]]></en>
</password>--> </password>-->
<suggest type="toolButton" class="ss_sprite button_toolbar ss_lightbulb" onclick="fieldsAdd('suggest')" buttonType="class"> <suggest type="toolButton" class="ss_sprite button_toolbar ss_lightbulb" onclick="fieldsAdd('suggest');return false;" buttonType="class">
<en>Suggest</en> <en>Suggest</en>
</suggest> </suggest>
<textarea type="toolButton" class="ss_sprite button_toolbar ss_textarea" onclick="fieldsAdd('textarea')" buttonType="class"> <textarea type="toolButton" class="ss_sprite button_toolbar ss_textarea" onclick="fieldsAdd('textarea');return false;" buttonType="class">
<en>TextArea</en> <en>TextArea</en>
</textarea> </textarea>
<!--.--> <!--.-->
<separator5 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator5 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<dropdown type="toolButton" class="ss_sprite button_toolbar ss_dropdown" onclick="fieldsAdd('dropdown')" buttonType="class"> <dropdown type="toolButton" class="ss_sprite button_toolbar ss_dropdown" onclick="fieldsAdd('dropdown');return false;" buttonType="class">
<en>Dropdown</en> <en>Dropdown</en>
</dropdown> </dropdown>
<yesno type="toolButton" class="ss_sprite button_toolbar ss_yesno" onclick="fieldsAdd('yesno')" buttonType="class"> <yesno type="toolButton" class="ss_sprite button_toolbar ss_yesno" onclick="fieldsAdd('yesno');return false;" buttonType="class">
<en>Yes/No</en> <en>Yes/No</en>
</yesno> </yesno>
<separator5 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator5 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<checkbox type="toolButton" class="ss_sprite button_toolbar ss_check" onclick="fieldsAdd('checkbox')" buttonType="class"> <checkbox type="toolButton" class="ss_sprite button_toolbar ss_check" onclick="fieldsAdd('checkbox');return false;" buttonType="class">
<en>Checkbox</en> <en>Checkbox</en>
</checkbox> </checkbox>
<separator7 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator7 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<date type="toolButton" class="ss_sprite button_toolbar ss_date" onclick="fieldsAdd('date')" buttonType="class"> <date type="toolButton" class="ss_sprite button_toolbar ss_date" onclick="fieldsAdd('date');return false;" buttonType="class">
<en>Date</en> <en>Date</en>
</date> </date>
<hidden type="toolButton" class="ss_sprite button_toolbar ss_hidden" onclick="fieldsAdd('hidden')" buttonType="class"> <hidden type="toolButton" class="ss_sprite button_toolbar ss_hidden" onclick="fieldsAdd('hidden');return false;" buttonType="class">
<en>Hidden</en> <en>Hidden</en>
</hidden> </hidden>
<link type="toolButton" class="ss_sprite button_toolbar ss_link" onclick="fieldsAdd('link')" buttonType="class"> <link type="toolButton" class="ss_sprite button_toolbar ss_link" onclick="fieldsAdd('link');return false;" buttonType="class">
<en>Link</en> <en>Link</en>
</link> </link>
<file type="toolButton" class="ss_sprite button_toolbar ss_upload" onclick="fieldsAdd('file')" buttonType="class"> <file type="toolButton" class="ss_sprite button_toolbar ss_upload" onclick="fieldsAdd('file');return false;" buttonType="class">
<en>File</en> <en>File</en>
</file> </file>
<separator10 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/> <separator10 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>