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

Merged in bugfix/HOR-4014 (pull request #6167)

Browse Source 
HOR-4014

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly
2017-11-28 16:16:26 +00:00
committed by Julio Cesar Laura Avendaño
parent f9b56ce67d 0e28e1db00
commit 6a07aec0c2
2 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1682,10 +1682,11 @@ function mapPMFieldType(id)
case 'dropdown':
case 'yesno':
case 'checkbox':
case 'radio':
case 'radiogroup':
case 'hidden':
typeField = 'VARCHAR';
sizeField = '32';
sizeField = '255';
break;
case 'currency':
typeField = 'INTEGER';
@@ -1717,21 +1718,21 @@ function mapPMFieldType(id)
sizeField = '11';
break;
case 'boolean':
typeField = 'INTEGER';
sizeField = '1';
typeField = 'BOOLEAN';
sizeField = '';
break;
case 'date':
typeField = 'VARCHAR';
sizeField = '255';
typeField = 'DATE';
sizeField = '';
break;
case 'datetime':
typeField = 'VARCHAR';
sizeField = '255';
typeField = 'DATETIME';
sizeField = '';
break;
default:
typeField = 'TEXT';
sizeField = '';
typeField = 'VARCHAR';
sizeField = '255';
break;
}

69
workflow/engine/templates/reportTables/edit.js
View File

@@ -1191,43 +1191,44 @@ function loadAvFieldsFromArray(records)
function mapPMFieldType(id)
{
var meta = id.split('-');
var meta = id.split('-');
switch(meta[1]) {
case 'text':
case 'password':
case 'dropdown':
case 'yesno':
case 'checkbox':
case 'radiogroup':
case 'hidden':
typeField='VARCHAR';
sizeField='32';
break;
case 'currency':
typeField='INT';
sizeField='11';
break;
case 'percentage':
typeField='FLOAT';
sizeField='11';
break;
case 'date':
typeField='DATE';
sizeField='';
break;
case 'textarea':
typeField='TEXT';
sizeField='';
break;
switch (meta[1]) {
case 'text':
case 'password':
case 'dropdown':
case 'yesno':
case 'checkbox':
case 'radio':
case 'radiogroup':
case 'hidden':
typeField = 'VARCHAR';
sizeField = '255';
break;
case 'currency':
typeField = 'INT';
sizeField = '11';
break;
case 'percentage':
typeField = 'FLOAT';
sizeField = '11';
break;
case 'date':
typeField = 'DATE';
sizeField = '';
break;
case 'textarea':
typeField = 'VARCHAR';
sizeField = '255';
break;
default:
typeField='TEXT';
sizeField='';
break;
}
default:
typeField = 'VARCHAR';
sizeField = '255';
break;
}
return {type:typeField, size:sizeField};
return {type: typeField, size: sizeField};
}
Ext.override(Ext.form.TextField, {