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

Merge branch '2.0' of git.colosa.net:processmaker into 2.0

Browse Source
This commit is contained in:
Carlos Pacha
2011-03-30 10:40:25 -04:00
parent 7f7a0eeab2 c5998c0ec7
commit 0fb7ae29dd
15 changed files with 916 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.derivation.php
View File

@@ -700,6 +700,10 @@ class Derivation
}
$oSubApplication = new SubApplication();
$oSubApplication->create($aSubApplication);
//Update the AppDelegation to execute the update trigger
$AppDelegation = AppDelegationPeer::retrieveByPK($aNewCase['APPLICATION'], $aNewCase['INDEX']);
$AppDelegation->setDelInitDate("+1 second");
$AppDelegation->save();
//If not is SYNCHRONOUS derivate one more time
if ($aSP['SP_SYNCHRONOUS'] == 0) {
$this->case->setDelInitDate($currentDelegation['APP_UID'], $iNewDelIndex);

4
workflow/engine/classes/class.processMap.php
View File

@@ -3247,6 +3247,10 @@ class processMap {
$sObject = G::LoadTranslation('ID_ALL');
}
break;
default :
$sObjectType = G::LoadTranslation('ID_ALL');
$sObject = G::LoadTranslation('ID_ALL');
break;
}
//Participated
if ($aRow ['OP_PARTICIPATE'] == 0) {

7
workflow/engine/js/processmap/core/processmap.js
View File

@@ -2337,9 +2337,14 @@ processmap.prototype={
/* Panel editor */
this.panels.editor=new leimnud.module.panel();
oClientWinSize = getClientWindowSize();
var heightPanel = this.options.size.h;
if(heightPanel <= oClientWinSize.height ) heightPanel = heightPanel + 800;
this.panels.editor.options={
limit:true,
size:{w:this.options.size.w,h:this.options.size.h},
// size:{w:this.options.size.w,h:this.options.size.h},
size:{w:this.options.size.w,h:heightPanel},
position:{x:200,y:0,centerX:true},
title:"",
titleBar:false,

4
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -395,7 +395,7 @@
$caseColumns[] = array( 'header' => 'PreUsrUid', 'dataIndex' => 'PREVIOUS_USR_UID', 'width' => 50, 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'), 'dataIndex' => 'APP_PRO_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'), 'dataIndex' => 'APP_TAS_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'), 'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 120 );
//$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'), 'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_CURRENT_USER'),'dataIndex' => 'APP_CURRENT_USER', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE', 'width' => 80 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_STATUS'), 'dataIndex' => 'APP_STATUS', 'width' => 50 );
@@ -430,7 +430,7 @@
$caseColumns[] = array( 'header' => 'PreUsrUid', 'dataIndex' => 'PREVIOUS_USR_UID', 'width' => 50 , 'hidden'=> true, 'hideable'=> false);
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_TASK'), 'dataIndex' => 'APP_TAS_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_PROCESS'), 'dataIndex' => 'APP_PRO_TITLE', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'), 'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 120 );
//$caseColumns[] = array( 'header' => G::LoadTranslation('ID_SENT_BY'), 'dataIndex' => 'APP_DEL_PREVIOUS_USER', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_CURRENT_USER'), 'dataIndex' => 'APP_CURRENT_USER', 'width' => 120 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_LAST_MODIFY'), 'dataIndex' => 'APP_UPDATE_DATE', 'width' => 80 );
$caseColumns[] = array( 'header' => G::LoadTranslation('ID_DELEGATION_DATE'),'dataIndex' => 'DEL_DELEGATE_DATE', 'width' => 80 );

6
workflow/engine/methods/cases/casesStartPage_Ajax.php
View File

@@ -216,6 +216,9 @@ function startCase() {
if (isset ( $_SESSION ['TASK'] )) unset ( $_SESSION ['TASK'] );
if (isset ( $_SESSION ['INDEX'] )) unset ( $_SESSION ['INDEX'] );
if (isset ( $_SESSION ['STEP_POSITION'] )) unset ( $_SESSION ['STEP_POSITION'] );
if (isset ( $_SESSION ['START_NEW_CASE'] )) unset ( $_SESSION ['START_NEW_CASE'] );
//echo 'Start new case<br />';
/* Process */
try {
@@ -224,6 +227,7 @@ function startCase() {
lookinginforContentProcess($_POST['processId']);
$aData = $oCase->startCase ( $_REQUEST ['taskId'], $_SESSION ['USER_LOGGED'] );
$_SESSION ['APPLICATION'] = $aData ['APPLICATION'];
$_SESSION ['INDEX'] = $aData ['INDEX'];
$_SESSION ['PROCESS'] = $aData ['PROCESS'];
@@ -240,6 +244,8 @@ function startCase() {
$_SESSION ['BREAKSTEP'] ['NEXT_STEP'] = $aNextStep;
$aData ['openCase'] = $aNextStep;
$aData ['NewDynaform'] = true; //Sets New Dynaform value
$aData ['status'] = 'success';
print (G::json_encode ( $aData )) ;
}

3
workflow/engine/methods/cases/cases_Open.php
View File

@@ -42,6 +42,9 @@ if( $RBAC->userCanAccess('PM_CASES') != 1 ) {
require_once 'classes/model/AppDelay.php';
G::LoadClass('case');
//Clean NEW_CASE session variable if case isn't new.
if ($_GET['new']!='yes') $_SESSION['NEW_CASE'] = '';
$oCase = new Cases();
//cleaning the case session data

9
workflow/engine/methods/cases/open.php
View File

@@ -46,6 +46,15 @@
if( isset($_GET['APP_UID']) && isset($_GET['DEL_INDEX'])) {
$case = $oCase->loadCase($_GET['APP_UID'], $_GET['DEL_INDEX']);
$appNum = $case['APP_TITLE'];
//Sets NEW_CASE session variable when we're starting a new case
if (isset($_GET['new'])){
if ($_GET['new']=='yes'){
$_SESSION['NEW_CASE'] = 'New';
}else{
$_SESSION['NEW_CASE'] = '';
}
}
}
if (!isset($_GET['to_revise'])){

7
workflow/engine/methods/cases/proxyCasesList.php
View File

@@ -328,14 +328,14 @@
if( isset($aRow['DEL_PRIORITY']) ){
$aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}");
}
/* For participated cases, we want the last step in the case, not only
* the last step this user participated. To do that we get every case
* information again for the last step. (This could be solved by a subquery,
* but Propel might not support it and subqueries can be slower for larger
* datasets).
*/
if ($action == 'sent') {
if ($action == 'sent' || $action == 'search') {
$maxCriteria = new Criteria('workflow');
$maxCriteria->add(AppCacheViewPeer::APP_UID, $aRow['APP_UID'], Criteria::EQUAL);
$maxCriteria->addDescendingOrderByColumn(AppCacheViewPeer::DEL_INDEX);
@@ -354,6 +354,9 @@
$maxDataset->close();
}
if (!isset($aRow['APP_CURRENT_USER']))
$aRow['APP_CURRENT_USER'] = "[Unassigned]";
$rows[] = $aRow;
$oDataset->next();
}

6
workflow/engine/templates/cases/casesStartCase.js
View File

@@ -376,7 +376,11 @@ function openCaseA(n){
var res = Ext.util.JSON.decode(response.responseText);
if (res.openCase) {
window.location = res.openCase.PAGE;
if (res.NewDynaform){
window.location = res.openCase.PAGE + '&new=yes';
}else{
window.location = res.openCase.PAGE;
}
} else {
Ext.Msg.show({
title : TRANSLATIONS.ID_ERROR_CREATING_NEW_CASE, // 'Error creating a new Case',

257
workflow/engine/xmlform/additionalTables/additionalTablesEdit.xml
View File

@@ -65,10 +65,6 @@
<JS type="javascript">
<![CDATA[
var changeToUpper = function() {
this.value = this.value.toUpperCase();
};
var onChangeType = function(iRow, bEmpty) {
var iRow = iRow | this.name.split('][')[1];
var oAux;
@@ -76,95 +72,25 @@ var onChangeType = function(iRow, bEmpty) {
case 'VARCHAR':
oAux = getGridField('FIELDS', iRow, 'FLD_SIZE');
oAux.readOnly = '';
/*oAux = getGridField('FIELDS', iRow, 'FLD_AUTO_INCREMENT');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
if (bEmpty) {
oAux.checked = false;
oAux.disabled = false;
}
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
if (!getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY').checked) {
oAux.disabled = true;
oAux.value = '';
}*/
break;
break;
case 'TEXT':
oAux = getGridField('FIELDS', iRow, 'FLD_SIZE');
oAux.value = '';
oAux.readOnly = 'readOnly';
/*oAux = getGridField('FIELDS', iRow, 'FLD_AUTO_INCREMENT');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
if (bEmpty) {
oAux.checked = false;
oAux.disabled = true;
}
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
oAux.disabled = true;
oAux.value = '';*/
break;
break;
case 'DATE':
oAux = getGridField('FIELDS', iRow, 'FLD_SIZE');
oAux.value = '';
oAux.readOnly = 'readOnly';
/*oAux = getGridField('FIELDS', iRow, 'FLD_AUTO_INCREMENT');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
oAux.disabled = true;
oAux.value = '';*/
break;
break;
case 'INT':
oAux = getGridField('FIELDS', iRow, 'FLD_SIZE');
oAux.readOnly = '';
/*oAux = getGridField('FIELDS', iRow, 'FLD_AUTO_INCREMENT');
if (bEmpty) {
oAux.checked = false;
oAux.disabled = false;
}
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
if (bEmpty) {
oAux.checked = false;
oAux.disabled = false;
}
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
if (bEmpty) {
oAux.disabled = true;
oAux.value = '';
}*/
break;
break;
case 'FLOAT':
oAux = getGridField('FIELDS', iRow, 'FLD_SIZE');
oAux.readOnly = '';
/*oAux = getGridField('FIELDS', iRow, 'FLD_AUTO_INCREMENT');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
oAux.disabled = true;
oAux.value = '';*/
break;
}
};
var onClickForeignKey = function(iRow) {
var iRow = iRow | this.name.split('][')[1];
var oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
if (getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY').checked) {
oAux.disabled = false;
oAux.value = '';
}
else {
oAux.disabled = true;
oAux.value = '';
break;
}
};
@@ -176,53 +102,53 @@ var verifyData = function(oForm) {
var fieldsTmp = [];
var words = '';
var aReservedWords = new Array('ADD','ALL','ALTER','ANALYZE','AND','AS','ASC','ASENSITIVE','BEFORE',
'BETWEEN','BIGINT','BINARY','BLOB','BOTH','BY','CALL','CASCADE','CASE',
'CHANGE','CHAR','CHARACTER','CHECK','COLLATE','COLUMN','CONDITION',
'CONSTRAINT','CONTINUE','CONVERT','CREATE','CROSS','CURRENT_DATE',
'CURRENT_TIME','CURRENT_TIMESTAMP','CURRENT_USER','CURSOR','DATABASE',
'DATABASES','DAY_HOUR','DAY_MICROSECOND','DAY_MINUTE','DAY_SECOND','DEC',
'DECIMAL','DECLARE','DEFAULT','DELAYED','DELETE','DESC','DESCRIBE',
'DETERMINISTIC','DISTINCT','DISTINCTROW','DIV','DOUBLE','DROP','DUAL',
'EACH','ELSE','ELSEIF','ENCLOSED','ESCAPED','EXISTS','EXIT','EXPLAIN',
'FALSE','FETCH','FLOAT','FLOAT4','FLOAT8','FOR','FORCE','FOREIGN','FROM',
'FULLTEXT','GRANT','GROUP','HAVING','HIGH_PRIORITY','HOUR_MICROSECOND',
'HOUR_MINUTE','HOUR_SECOND','IF','IGNORE','IN','INDEX','INFILE','INNER',
'INOUT','INSENSITIVE','INSERT','INT','INT1','INT2','INT3','INT4','INT8',
'INTEGER','INTERVAL','INTO','IS','ITERATE','JOIN','KEY','KEYS','KILL',
'LEADING','LEAVE','LEFT','LIKE','LIMIT','LINES','LOAD','LOCALTIME',
'LOCALTIMESTAMP','LOCK','LONG','LONGBLOB','LONGTEXT','LOOP','LOW_PRIORITY',
'MATCH','MEDIUMBLOB','MEDIUMINT','MEDIUMTEXT','MIDDLEINT','MINUTE_MICROSECOND',
'MINUTE_SECOND','MOD','MODIFIES','NATURAL','NOT','NO_WRITE_TO_BINLOG','NULL',
'NUMERIC','ON','OPTIMIZE','OPTION','OPTIONALLY','OR','ORDER','OUT','OUTER',
'OUTFILE','PRECISION','PRIMARY','PROCEDURE','PURGE','READ','READS','REAL',
'REFERENCES','REGEXP','RELEASE','RENAME','REPEAT','REPLACE','REQUIRE',
'RESTRICT','RETURN','REVOKE','RIGHT','RLIKE','SCHEMA','SCHEMAS','SECOND_MICROSECOND',
'SELECT','SENSITIVE','SEPARATOR','SET','SHOW','SMALLINT','SONAME','SPATIAL',
'SPECIFIC','SQL','SQLEXCEPTION','SQLSTATE','SQLWARNING','SQL_BIG_RESULT',
'SQL_CALC_FOUND_ROWS','SQL_SMALL_RESULT','SSL','STARTING','STRAIGHT_JOIN',
'TABLE','TERMINATED','THEN','TINYBLOB','TINYINT','TINYTEXT','TO','TRAILING',
'TRIGGER','TRUE','UNDO','UNION','UNIQUE','UNLOCK','UNSIGNED','UPDATE','USAGE',
'USE','USING','UTC_DATE','UTC_TIME','UTC_TIMESTAMP','VALUES','VARBINARY',
'VARCHAR','VARCHARACTER','VARYING','WHEN','WHERE','WHILE','WITH','WRITE',
'XOR','YEAR_MONTH','ZEROFILL','ASENSITIVE','CALL','CONDITION','CONTINUE',
'CURSOR','DECLARE','DETERMINISTIC','EACH','ELSEIF','EXIT','FETCH','INOUT',
'INSENSITIVE','ITERATE','LEAVE','LOOP','MODIFIES','OUT','READS','RELEASE',
'REPEAT','RETURN','SCHEMA','SCHEMAS','SENSITIVE','SPECIFIC','SQL',
'SQLEXCEPTION','SQLSTATE','SQLWARNING','TRIGGER','UNDO','WHILE');
'BETWEEN','BIGINT','BINARY','BLOB','BOTH','BY','CALL','CASCADE','CASE',
'CHANGE','CHAR','CHARACTER','CHECK','COLLATE','COLUMN','CONDITION',
'CONSTRAINT','CONTINUE','CONVERT','CREATE','CROSS','CURRENT_DATE',
'CURRENT_TIME','CURRENT_TIMESTAMP','CURRENT_USER','CURSOR','DATABASE',
'DATABASES','DAY_HOUR','DAY_MICROSECOND','DAY_MINUTE','DAY_SECOND','DEC',
'DECIMAL','DECLARE','DEFAULT','DELAYED','DELETE','DESC','DESCRIBE',
'DETERMINISTIC','DISTINCT','DISTINCTROW','DIV','DOUBLE','DROP','DUAL',
'EACH','ELSE','ELSEIF','ENCLOSED','ESCAPED','EXISTS','EXIT','EXPLAIN',
'FALSE','FETCH','FLOAT','FLOAT4','FLOAT8','FOR','FORCE','FOREIGN','FROM',
'FULLTEXT','GRANT','GROUP','HAVING','HIGH_PRIORITY','HOUR_MICROSECOND',
'HOUR_MINUTE','HOUR_SECOND','IF','IGNORE','IN','INDEX','INFILE','INNER',
'INOUT','INSENSITIVE','INSERT','INT','INT1','INT2','INT3','INT4','INT8',
'INTEGER','INTERVAL','INTO','IS','ITERATE','JOIN','KEY','KEYS','KILL',
'LEADING','LEAVE','LEFT','LIKE','LIMIT','LINES','LOAD','LOCALTIME',
'LOCALTIMESTAMP','LOCK','LONG','LONGBLOB','LONGTEXT','LOOP','LOW_PRIORITY',
'MATCH','MEDIUMBLOB','MEDIUMINT','MEDIUMTEXT','MIDDLEINT','MINUTE_MICROSECOND',
'MINUTE_SECOND','MOD','MODIFIES','NATURAL','NOT','NO_WRITE_TO_BINLOG','NULL',
'NUMERIC','ON','OPTIMIZE','OPTION','OPTIONALLY','OR','ORDER','OUT','OUTER',
'OUTFILE','PRECISION','PRIMARY','PROCEDURE','PURGE','READ','READS','REAL',
'REFERENCES','REGEXP','RELEASE','RENAME','REPEAT','REPLACE','REQUIRE',
'RESTRICT','RETURN','REVOKE','RIGHT','RLIKE','SCHEMA','SCHEMAS','SECOND_MICROSECOND',
'SELECT','SENSITIVE','SEPARATOR','SET','SHOW','SMALLINT','SONAME','SPATIAL',
'SPECIFIC','SQL','SQLEXCEPTION','SQLSTATE','SQLWARNING','SQL_BIG_RESULT',
'SQL_CALC_FOUND_ROWS','SQL_SMALL_RESULT','SSL','STARTING','STRAIGHT_JOIN',
'TABLE','TERMINATED','THEN','TINYBLOB','TINYINT','TINYTEXT','TO','TRAILING',
'TRIGGER','TRUE','UNDO','UNION','UNIQUE','UNLOCK','UNSIGNED','UPDATE','USAGE',
'USE','USING','UTC_DATE','UTC_TIME','UTC_TIMESTAMP','VALUES','VARBINARY',
'VARCHAR','VARCHARACTER','VARYING','WHEN','WHERE','WHILE','WITH','WRITE',
'XOR','YEAR_MONTH','ZEROFILL','ASENSITIVE','CALL','CONDITION','CONTINUE',
'CURSOR','DECLARE','DETERMINISTIC','EACH','ELSEIF','EXIT','FETCH','INOUT',
'INSENSITIVE','ITERATE','LEAVE','LOOP','MODIFIES','OUT','READS','RELEASE',
'REPEAT','RETURN','SCHEMA','SCHEMAS','SENSITIVE','SPECIFIC','SQL',
'SQLEXCEPTION','SQLSTATE','SQLWARNING','TRIGGER','UNDO','WHILE');
for (var i = 1; i <= iRows; i++) {
for(var j = 0; j < aReservedWords.length; j++ ) {
if(getGridField('FIELDS', i, 'FLD_NAME').value == aReservedWords[j]) {
words = words +" "+getGridField('FIELDS', i, 'FLD_NAME').value;
}
}
}
if (words != ''){
new leimnud.module.app.alert().make({
}
}
if (words != ''){
new leimnud.module.app.alert().make({
label:G_STRINGS.ID_FIELDS_RESERVED_WORDS + ' ' + words
});
words='';
bContinue = false;
}
});
words='';
bContinue = false;
}
for (var i = 1; i <= iRows; i++) {
if (getGridField('FIELDS', i, 'FLD_NAME').value == '') {
bContinue = false;
@@ -235,56 +161,48 @@ var verifyData = function(oForm) {
bContinue = false;
iMessage = 2;
}
break;
break;
case 'TEXT':
if (getGridField('FIELDS', i, 'FLD_KEY').checked ) {
bContinue = false;
iMessage = 4;
}
break;
break;
case 'DATE':
break;
break;
case 'INT':
if (getGridField('FIELDS', i, 'FLD_SIZE').value == '') {
bContinue = false;
iMessage = 2;
}
break;
break;
case 'FLOAT':
if (getGridField('FIELDS', i, 'FLD_SIZE').value == '') {
bContinue = false;
iMessage = 2;
}
break;
break;
}
}
/*if (bContinue) {
if (getGridField('FIELDS', i, 'FLD_FOREIGN_KEY').checked) {
if (getGridField('FIELDS', i, 'FLD_FOREIGN_KEY_TABLE').value == '') {
bContinue = false;
iMessage = 3;
}
}
}*/
// Check duplicate fields
if(bContinue) {
if(!(getGridField('FIELDS', i, 'FLD_NAME').value in fieldsTmp)) {
fieldsTmp[getGridField('FIELDS', i, 'FLD_NAME').value]++;
fieldsTmp[getGridField('FIELDS', i, 'FLD_NAME').value]++;
} else {
bContinue = false;
iMessage = 5;
sDuplicate = getGridField('FIELDS', i, 'FLD_NAME').value;
bContinue = false;
iMessage = 5;
sDuplicate = getGridField('FIELDS', i, 'FLD_NAME').value;
}
}
if(bContinue){
var sFldName = getGridField('FIELDS', i, 'FLD_NAME').value;
var sFirstCharFldName = sFldName.charAt(0);
pattern =/[A-Za-z_]/;
if(pattern.test(sFirstCharFldName) == false) {
bContinue = false;
iMessage = 6;
sInvalidField = getGridField('FIELDS', i, 'FLD_NAME').value;
}
var sFldName = getGridField('FIELDS', i, 'FLD_NAME').value;
var sFirstCharFldName = sFldName.charAt(0);
pattern =/[A-Za-z_]/;
if(pattern.test(sFirstCharFldName) == false) {
bContinue = false;
iMessage = 6;
sInvalidField = getGridField('FIELDS', i, 'FLD_NAME').value;
}
}
}
var bContinueKey = false;
@@ -309,32 +227,32 @@ var verifyData = function(oForm) {
new leimnud.module.app.alert().make({
label:"@G::LoadTranslation(ID_FIELD_NAME_REQUIRED)"
});
break;
break;
case 2:
new leimnud.module.app.alert().make({
label:"@G::LoadTranslation(ID_FIELD_SIZE_REQUIRED)"
});
break;
break;
case 3:
new leimnud.module.app.alert().make({
label:G_STRINGS.ID_FIELD_FOREIGN_TABLE
});
break;
break;
case 4:
new leimnud.module.app.alert().make({
label:"@G::LoadTranslation(ID_FIELD_CANNOT_BE_PRIMARY_KEY)"
});
break;
break;
case 5:
new leimnud.module.app.alert().make({
label:"@G::LoadTranslation(ID_FIELD_DUPLICATE)" + " " + sDuplicate
});
break;
break;
case 6:
new leimnud.module.app.alert().make({
label:"@G::LoadTranslation(ID_FIELD_INVALID)" + " " + sInvalidField
});
break;
break;
}
}
else {
@@ -348,22 +266,21 @@ var verifyData = function(oForm) {
var changeValues = function(iRow, sType) {
iRow = parseInt(iRow);
switch (sType) {
case 'UP':
if (iRow == 1) {
return;
}
var iOtherRow = iRow - 1;
break;
break;
case 'DOWN':
if (iRow == Number_Rows_Grid('FIELDS', 'FLD_UID')) {
return;
}
var iOtherRow = iRow + 1;
break;
break;
}
var FLD_UID = getGridField('FIELDS', iOtherRow, 'FLD_UID').value;
var FLD_NAME = getGridField('FIELDS', iOtherRow, 'FLD_NAME').value;
var FLD_DESCRIPTION = getGridField('FIELDS', iOtherRow, 'FLD_DESCRIPTION').value;
@@ -382,11 +299,11 @@ var changeValues = function(iRow, sType) {
getGridField('FIELDS', iOtherRow, 'FLD_SIZE').value = getGridField('FIELDS', iRow, 'FLD_SIZE').value;
getGridField('FIELDS', iOtherRow, 'FLD_NULL').checked = getGridField('FIELDS', iRow, 'FLD_NULL').checked;
getGridField('FIELDS', iOtherRow, 'FLD_KEY').checked = getGridField('FIELDS', iRow, 'FLD_KEY').checked;
getGridField('FIELDS', iOtherRow, 'FLD_NULL_HDN').value = getGridField('FIELDS', iRow, 'FLD_NULL_HDN').value;
getGridField('FIELDS', iOtherRow, 'FLD_KEY_HDN').value = getGridField('FIELDS', iRow, 'FLD_KEY_HDN').value;
getGridField('FIELDS', iRow, 'FLD_UID').value = FLD_UID;
getGridField('FIELDS', iRow, 'FLD_NAME').value = FLD_NAME;
getGridField('FIELDS', iRow, 'FLD_DESCRIPTION').value = FLD_DESCRIPTION;
@@ -394,49 +311,39 @@ var changeValues = function(iRow, sType) {
getGridField('FIELDS', iRow, 'FLD_SIZE').value = FLD_SIZE;
getGridField('FIELDS', iRow, 'FLD_NULL').checked = FLD_NULL;
getGridField('FIELDS', iRow, 'FLD_KEY').checked = FLD_KEY;
getGridField('FIELDS', iRow, 'FLD_NULL_HDN').value = FLD_NULL_HDN;
getGridField('FIELDS', iRow, 'FLD_KEY_HDN').value = FLD_KEY_HDN;
onChangeType(iRow, false);
onChangeType(iOtherRow, false);
};
var dynaformOnload = function() {
function LoadPMTable() {
//Adding events for the grid fields
var iRows = Number_Rows_Grid('FIELDS', 'FLD_UID');
var oAux;
for (var i = 1; i <= iRows; i++) {
oAux = getGridField('FIELDS', i, 'FLD_NAME');
leimnud.event.add(oAux, 'change', {method:changeToUpper,instance:oAux,event:true});
oAux = getGridField('FIELDS', i, 'FLD_TYPE');
leimnud.event.add(oAux, 'change', {method:onChangeType,instance:oAux,event:true});
//oAux = getGridField('FIELDS', i, 'FLD_FOREIGN_KEY');
//leimnud.event.add(oAux, 'click', {method:onClickForeignKey,instance:oAux,event:true});
onChangeType(i, false);
//onClickForeignKey(i, false);
}
getObject('FIELDS').onaddrow = function(iRow) {
oAux = getGridField('FIELDS', iRow, 'FLD_NAME');
leimnud.event.add(oAux, 'change', {method:changeToUpper,instance:oAux,event:true});
oAux = getGridField('FIELDS', iRow, 'FLD_TYPE');
leimnud.event.add(oAux, 'change', {method:onChangeType,instance:oAux,event:true});
//oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
//leimnud.event.add(oAux, 'click', {method:onClickForeignKey,instance:oAux,event:true});
onChangeType(iRow, true);
//onClickForeignKey(iRow, true);
document.getElementById('FIELDS').rows[iRow].getElementsByTagName('td')[10].innerHTML = document.getElementById('FIELDS').rows[1].getElementsByTagName('td')[10].innerHTML.replace('[1]', '[' + iRow + ']');
document.getElementById('FIELDS').rows[iRow].getElementsByTagName('td')[11].innerHTML = document.getElementById('FIELDS').rows[1].getElementsByTagName('td')[11].innerHTML.replace('[1]', '[' + iRow + ']');
};
//
};
function cancel(){
window.location = 'additionalTablesList';
window.location = 'additionalTablesList';
}
dynaformOnload = LoadPMTable;
]]>
</JS>

2
workflow/engine/xmlform/additionalTables/additionalTablesFields.xml
View File

@@ -3,7 +3,7 @@
<FLD_UID type="text" size="1" style="display:none;"/>
<FLD_NAME type="text" size="15" maxlength="64" validate="Field">
<FLD_NAME type="text" size="15" maxlength="64" validate="Field" strto="UPPER">
<en>Field Name</en>
</FLD_NAME>

2
workflow/engine/xmlform/additionalTables/additionalTablesFields2.xml
View File

@@ -3,7 +3,7 @@
<FLD_UID type="text" size="1" style="display:none;"/>
<FLD_NAME type="text" size="15" maxlength="64" validate="Field">
<FLD_NAME type="text" size="15" maxlength="64" validate="Field" strto="UPPER">
<en>Field Name</en>
</FLD_NAME>

295
workflow/engine/xmlform/additionalTables/additionalTablesNew.xml
View File

@@ -69,10 +69,6 @@
<JS type="javascript">
<![CDATA[
var changeToUpper = function() {
this.value = this.value.toUpperCase();
};
var onChangeType = function(iRow) {
var iRow = iRow | this.name.split('][')[1];
var oAux;
@@ -80,73 +76,25 @@ var onChangeType = function(iRow) {
case 'VARCHAR':
oAux = getGridField('FIELDS', iRow, 'FLD_SIZE');
oAux.readOnly = '';
/*oAux = getGridField('FIELDS', iRow, 'FLD_AUTO_INCREMENT');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
oAux.checked = false;
oAux.disabled = false;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
oAux.disabled = true;
oAux.value = '';*/
break;
break;
case 'TEXT':
oAux = getGridField('FIELDS', iRow, 'FLD_SIZE');
oAux.value = '';
oAux.readOnly = 'readOnly';
/*oAux = getGridField('FIELDS', iRow, 'FLD_AUTO_INCREMENT');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
oAux.disabled = true;
oAux.value = '';
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
oAux.disabled = true;
oAux.value = '';*/
break;
break;
case 'DATE':
oAux = getGridField('FIELDS', iRow, 'FLD_SIZE');
oAux.value = '';
oAux.readOnly = 'readOnly';
/*oAux = getGridField('FIELDS', iRow, 'FLD_AUTO_INCREMENT');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
oAux.disabled = true;
oAux.value = '';*/
break;
break;
case 'INT':
oAux = getGridField('FIELDS', iRow, 'FLD_SIZE');
oAux.readOnly = '';
/*oAux = getGridField('FIELDS', iRow, 'FLD_AUTO_INCREMENT');
oAux.checked = false;
oAux.disabled = false;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
oAux.checked = false;
oAux.disabled = false;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
oAux.disabled = true;
oAux.value = '';*/
break;
break;
case 'FLOAT':
oAux = getGridField('FIELDS', iRow, 'FLD_SIZE');
oAux.readOnly = '';
/*oAux = getGridField('FIELDS', iRow, 'FLD_AUTO_INCREMENT');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
oAux.checked = false;
oAux.disabled = true;
oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY_TABLE');
oAux.disabled = true;
oAux.value = '';*/
break;
break;
}
};
@@ -162,40 +110,40 @@ var onClickForeignKey = function(iRow) {
oAux.value = '';
}
};
var aReservedWords = new Array('ADD','ALL','ALTER','ANALYZE','AND','AS','ASC','ASENSITIVE','BEFORE',
'BETWEEN','BIGINT','BINARY','BLOB','BOTH','BY','CALL','CASCADE','CASE',
'CHANGE','CHAR','CHARACTER','CHECK','COLLATE','COLUMN','CONDITION',
'CONSTRAINT','CONTINUE','CONVERT','CREATE','CROSS','CURRENT_DATE',
'CURRENT_TIME','CURRENT_TIMESTAMP','CURRENT_USER','CURSOR','DATABASE',
'DATABASES','DAY_HOUR','DAY_MICROSECOND','DAY_MINUTE','DAY_SECOND','DEC',
'DECIMAL','DECLARE','DEFAULT','DELAYED','DELETE','DESC','DESCRIBE',
'DETERMINISTIC','DISTINCT','DISTINCTROW','DIV','DOUBLE','DROP','DUAL',
'EACH','ELSE','ELSEIF','ENCLOSED','ESCAPED','EXISTS','EXIT','EXPLAIN',
'FALSE','FETCH','FLOAT','FLOAT4','FLOAT8','FOR','FORCE','FOREIGN','FROM',
'FULLTEXT','GRANT','GROUP','HAVING','HIGH_PRIORITY','HOUR_MICROSECOND',
'HOUR_MINUTE','HOUR_SECOND','IF','IGNORE','IN','INDEX','INFILE','INNER',
'INOUT','INSENSITIVE','INSERT','INT','INT1','INT2','INT3','INT4','INT8',
'INTEGER','INTERVAL','INTO','IS','ITERATE','JOIN','KEY','KEYS','KILL',
'LEADING','LEAVE','LEFT','LIKE','LIMIT','LINES','LOAD','LOCALTIME',
'LOCALTIMESTAMP','LOCK','LONG','LONGBLOB','LONGTEXT','LOOP','LOW_PRIORITY',
'MATCH','MEDIUMBLOB','MEDIUMINT','MEDIUMTEXT','MIDDLEINT','MINUTE_MICROSECOND',
'MINUTE_SECOND','MOD','MODIFIES','NATURAL','NOT','NO_WRITE_TO_BINLOG','NULL',
'NUMERIC','ON','OPTIMIZE','OPTION','OPTIONALLY','OR','ORDER','OUT','OUTER',
'OUTFILE','PRECISION','PRIMARY','PROCEDURE','PURGE','READ','READS','REAL',
'REFERENCES','REGEXP','RELEASE','RENAME','REPEAT','REPLACE','REQUIRE',
'RESTRICT','RETURN','REVOKE','RIGHT','RLIKE','SCHEMA','SCHEMAS','SECOND_MICROSECOND',
'SELECT','SENSITIVE','SEPARATOR','SET','SHOW','SMALLINT','SONAME','SPATIAL',
'SPECIFIC','SQL','SQLEXCEPTION','SQLSTATE','SQLWARNING','SQL_BIG_RESULT',
'SQL_CALC_FOUND_ROWS','SQL_SMALL_RESULT','SSL','STARTING','STRAIGHT_JOIN',
'TABLE','TERMINATED','THEN','TINYBLOB','TINYINT','TINYTEXT','TO','TRAILING',
'TRIGGER','TRUE','UNDO','UNION','UNIQUE','UNLOCK','UNSIGNED','UPDATE','USAGE',
'USE','USING','UTC_DATE','UTC_TIME','UTC_TIMESTAMP','VALUES','VARBINARY',
'VARCHAR','VARCHARACTER','VARYING','WHEN','WHERE','WHILE','WITH','WRITE',
'XOR','YEAR_MONTH','ZEROFILL','ASENSITIVE','CALL','CONDITION','CONTINUE',
'CURSOR','DECLARE','DETERMINISTIC','EACH','ELSEIF','EXIT','FETCH','INOUT',
'INSENSITIVE','ITERATE','LEAVE','LOOP','MODIFIES','OUT','READS','RELEASE',
'REPEAT','RETURN','SCHEMA','SCHEMAS','SENSITIVE','SPECIFIC','SQL',
'SQLEXCEPTION','SQLSTATE','SQLWARNING','TRIGGER','UNDO','WHILE');
var aReservedWords = new Array('ADD','ALL','ALTER','ANALYZE','AND','AS','ASC','ASENSITIVE','BEFORE',
'BETWEEN','BIGINT','BINARY','BLOB','BOTH','BY','CALL','CASCADE','CASE',
'CHANGE','CHAR','CHARACTER','CHECK','COLLATE','COLUMN','CONDITION',
'CONSTRAINT','CONTINUE','CONVERT','CREATE','CROSS','CURRENT_DATE',
'CURRENT_TIME','CURRENT_TIMESTAMP','CURRENT_USER','CURSOR','DATABASE',
'DATABASES','DAY_HOUR','DAY_MICROSECOND','DAY_MINUTE','DAY_SECOND','DEC',
'DECIMAL','DECLARE','DEFAULT','DELAYED','DELETE','DESC','DESCRIBE',
'DETERMINISTIC','DISTINCT','DISTINCTROW','DIV','DOUBLE','DROP','DUAL',
'EACH','ELSE','ELSEIF','ENCLOSED','ESCAPED','EXISTS','EXIT','EXPLAIN',
'FALSE','FETCH','FLOAT','FLOAT4','FLOAT8','FOR','FORCE','FOREIGN','FROM',
'FULLTEXT','GRANT','GROUP','HAVING','HIGH_PRIORITY','HOUR_MICROSECOND',
'HOUR_MINUTE','HOUR_SECOND','IF','IGNORE','IN','INDEX','INFILE','INNER',
'INOUT','INSENSITIVE','INSERT','INT','INT1','INT2','INT3','INT4','INT8',
'INTEGER','INTERVAL','INTO','IS','ITERATE','JOIN','KEY','KEYS','KILL',
'LEADING','LEAVE','LEFT','LIKE','LIMIT','LINES','LOAD','LOCALTIME',
'LOCALTIMESTAMP','LOCK','LONG','LONGBLOB','LONGTEXT','LOOP','LOW_PRIORITY',
'MATCH','MEDIUMBLOB','MEDIUMINT','MEDIUMTEXT','MIDDLEINT','MINUTE_MICROSECOND',
'MINUTE_SECOND','MOD','MODIFIES','NATURAL','NOT','NO_WRITE_TO_BINLOG','NULL',
'NUMERIC','ON','OPTIMIZE','OPTION','OPTIONALLY','OR','ORDER','OUT','OUTER',
'OUTFILE','PRECISION','PRIMARY','PROCEDURE','PURGE','READ','READS','REAL',
'REFERENCES','REGEXP','RELEASE','RENAME','REPEAT','REPLACE','REQUIRE',
'RESTRICT','RETURN','REVOKE','RIGHT','RLIKE','SCHEMA','SCHEMAS','SECOND_MICROSECOND',
'SELECT','SENSITIVE','SEPARATOR','SET','SHOW','SMALLINT','SONAME','SPATIAL',
'SPECIFIC','SQL','SQLEXCEPTION','SQLSTATE','SQLWARNING','SQL_BIG_RESULT',
'SQL_CALC_FOUND_ROWS','SQL_SMALL_RESULT','SSL','STARTING','STRAIGHT_JOIN',
'TABLE','TERMINATED','THEN','TINYBLOB','TINYINT','TINYTEXT','TO','TRAILING',
'TRIGGER','TRUE','UNDO','UNION','UNIQUE','UNLOCK','UNSIGNED','UPDATE','USAGE',
'USE','USING','UTC_DATE','UTC_TIME','UTC_TIMESTAMP','VALUES','VARBINARY',
'VARCHAR','VARCHARACTER','VARYING','WHEN','WHERE','WHILE','WITH','WRITE',
'XOR','YEAR_MONTH','ZEROFILL','ASENSITIVE','CALL','CONDITION','CONTINUE',
'CURSOR','DECLARE','DETERMINISTIC','EACH','ELSEIF','EXIT','FETCH','INOUT',
'INSENSITIVE','ITERATE','LEAVE','LOOP','MODIFIES','OUT','READS','RELEASE',
'REPEAT','RETURN','SCHEMA','SCHEMAS','SENSITIVE','SPECIFIC','SQL',
'SQLEXCEPTION','SQLSTATE','SQLWARNING','TRIGGER','UNDO','WHILE');
var verifyData = function(oForm) {
if (oForm.onsubmit()) {
var bContinue = true;
@@ -203,21 +151,20 @@ var verifyData = function(oForm) {
var iRows = Number_Rows_Grid('FIELDS', 'FLD_UID');
var fieldsTmp = [];
var words = '';
for (var i = 1; i <= iRows; i++) {
for(var j = 0; j < aReservedWords.length; j++ ) {
if(getGridField('FIELDS', i, 'FLD_NAME').value == aReservedWords[j]) {
words = words +" "+getGridField('FIELDS', i, 'FLD_NAME').value;
}
}
}
if (words != ''){
new leimnud.module.app.alert().make({
}
}
if (words != ''){
new leimnud.module.app.alert().make({
label:G_STRINGS.ID_FIELDS_RESERVED_WORDS + ' ' + words
});
words='';
bContinue = false;
}
});
words='';
bContinue = false;
}
for (var i = 1; i <= iRows; i++) {
if (getGridField('FIELDS', i, 'FLD_NAME').value == '') {
bContinue = false;
@@ -230,59 +177,51 @@ var verifyData = function(oForm) {
bContinue = false;
iMessage = 2;
}
break;
break;
case 'TEXT':
if (getGridField('FIELDS', i, 'FLD_KEY').checked ) {
bContinue = false;
iMessage = 4;
}
break;
break;
case 'DATE':
break;
break;
case 'INT':
if (getGridField('FIELDS', i, 'FLD_SIZE').value == '') {
bContinue = false;
iMessage = 2;
}
break;
break;
case 'FLOAT':
if (getGridField('FIELDS', i, 'FLD_SIZE').value == '') {
bContinue = false;
iMessage = 2;
}
break;
break;
}
}
/*if (bContinue) {
if (getGridField('FIELDS', i, 'FLD_FOREIGN_KEY').checked) {
if (getGridField('FIELDS', i, 'FLD_FOREIGN_KEY_TABLE').value == '') {
bContinue = false;
iMessage = 3;
}
}
}*/
// Check duplicate fields
if(bContinue) {
if(!(getGridField('FIELDS', i, 'FLD_NAME').value.toUpperCase() in fieldsTmp)) {
fieldsTmp[getGridField('FIELDS', i, 'FLD_NAME').value.toUpperCase()]++;
fieldsTmp[getGridField('FIELDS', i, 'FLD_NAME').value.toUpperCase()]++;
} else {
bContinue = false;
iMessage = 5;
sDuplicate = getGridField('FIELDS', i, 'FLD_NAME').value.toUpperCase();
bContinue = false;
iMessage = 5;
sDuplicate = getGridField('FIELDS', i, 'FLD_NAME').value.toUpperCase();
}
}
// Check invalid character
if(bContinue){
var sFld_name = getGridField('FIELDS', i, 'FLD_NAME').value;
var firstChar = sFld_name.charAt(sFld_name);
pattern =/[A-Za-z_]/;
if(pattern.test(firstChar) == false) {
bContinue = false;
iMessage = 6;
sInvalidCharacter = sFld_name;
}
var sFld_name = getGridField('FIELDS', i, 'FLD_NAME').value;
var firstChar = sFld_name.charAt(sFld_name);
pattern =/[A-Za-z_]/;
if(pattern.test(firstChar) == false) {
bContinue = false;
iMessage = 6;
sInvalidCharacter = sFld_name;
}
}
}
var bContinueKey = false;
@@ -306,32 +245,32 @@ var verifyData = function(oForm) {
new leimnud.module.app.alert().make({
label:'@G::LoadTranslation(ID_FIELD_NAME_REQUIRED)'
});
break;
break;
case 2:
new leimnud.module.app.alert().make({
label:'@G::LoadTranslation(ID_FIELD_SIZE_REQUIRED)'
});
break;
break;
case 3:
new leimnud.module.app.alert().make({
label:G_STRINGS.ID_FIELD_FOREIGN_TABLE
});
break;
break;
case 4:
new leimnud.module.app.alert().make({
label:"@G::LoadTranslation(ID_FIELD_CANNOT_BE_PRIMARY_KEY)"
});
break;
break;
case 5:
new leimnud.module.app.alert().make({
label:"@G::LoadTranslation(ID_FIELD_DUPLICATE)" + " " + sDuplicate
});
break;
break;
case 6:
new leimnud.module.app.alert().make({
label:"@G::LoadTranslation(ID_FIELD_INVALID)" + " " + sInvalidCharacter
});
break;
break;
}
}
else {
@@ -344,8 +283,7 @@ var verifyData = function(oForm) {
}
};
leimnud.event.add(window, 'load', function() {
//Adding ajax validations
function LoadPMTable(){
leimnud.event.add(getField('ADD_TAB_NAME'), 'change', function() {
getField('ADD_TAB_NAME').value = getField('ADD_TAB_NAME').value.toUpperCase();
var sTableNameOld = getField('ADD_TAB_NAME_OLD').value;
@@ -373,45 +311,46 @@ leimnud.event.add(window, 'load', function() {
oSaveButton.disabled = false;
}
}
// if (getField('ADD_TAB_CLASS_NAME').value == '') {
var aAux = getField('ADD_TAB_NAME').value.split('_');
var sAux = '';
var i;
for (i = 0; i < aAux.length; i++) {
var sChar = aAux[i].substring(0,1).toUpperCase();
sAux += sChar + aAux[i].substring(1,aAux[i].length).toLowerCase();
}
pattern =/[A-Za-z_]/;
var first = sAux.charAt(sAux);
if(pattern.test(first) == false) {
sAux = '_' + sAux;;
}
getField('ADD_TAB_CLASS_NAME').value = sAux;
// }
var aAux = getField('ADD_TAB_NAME').value.split('_');
var sAux = '';
var i;
for (i = 0; i < aAux.length; i++) {
var sChar = aAux[i].substring(0,1).toUpperCase();
sAux += sChar + aAux[i].substring(1,aAux[i].length).toLowerCase();
}
pattern =/[A-Za-z_]/;
var first = sAux.charAt(sAux);
if(pattern.test(first) == false) {
sAux = '_' + sAux;;
}
getField('ADD_TAB_CLASS_NAME').value = sAux;
// Validate ilegal character
var sTbl_name = getField('ADD_TAB_NAME').value.toUpperCase();
var firstChar = sTbl_name.charAt(sTbl_name);
pattern =/[A-Za-z_]/;
if(pattern.test(firstChar) == false) {
new leimnud.module.app.alert().make({
label:'@G::LoadTranslation(ID_TABLE_INVALID_SYNTAX)' + ' ' + sTbl_name
});
oSaveButton.disabled = true;
new leimnud.module.app.alert().make({
label:'@G::LoadTranslation(ID_TABLE_INVALID_SYNTAX)' + ' ' + sTbl_name
});
oSaveButton.disabled = true;
}
// Reserved words
var sTableName = getField('ADD_TAB_NAME').value.toUpperCase();
for(var i = 0; i < aReservedWords.length; i++ ) {
if(sTableName == aReservedWords[i]) {
new leimnud.module.app.alert().make({
label:G_STRINGS.ID_TABLE_RESERVED_WORDS + ' ' + sTableName
});
oSaveButton.disabled = true;
}
}
for(var i = 0; i < aReservedWords.length; i++ ) {
if(sTableName == aReservedWords[i]) {
new leimnud.module.app.alert().make({
label:G_STRINGS.ID_TABLE_RESERVED_WORDS + ' ' + sTableName
});
oSaveButton.disabled = true;
}
}
});
leimnud.event.add(getField('ADD_TAB_CLASS_NAME'), 'change', function() {
var sClassNameOld = getField('ADD_TAB_CLASS_NAME_OLD').value;
var oSaveButton = getField('btnSave');
@@ -434,49 +373,31 @@ leimnud.event.add(window, 'load', function() {
}
}
else {
//if (sClassNameOld != '') {
oSaveButton.disabled = false;
//}
oSaveButton.disabled = false;
}
});
//Adding events for the grid fields
var iRows = Number_Rows_Grid('FIELDS', 'FLD_UID');
var oAux;
for (var i = 1; i <= iRows; i++) {
oAux = getGridField('FIELDS', i, 'FLD_NAME');
leimnud.event.add(oAux, 'change', {method:changeToUpper,instance:oAux,event:true});
oAux = getGridField('FIELDS', i, 'FLD_TYPE');
leimnud.event.add(oAux, 'change', {method:onChangeType,instance:oAux,event:true});
//oAux = getGridField('FIELDS', i, 'FLD_FOREIGN_KEY');
//leimnud.event.add(oAux, 'click', {method:onClickForeignKey,instance:oAux,event:true});
onChangeType(i);
//onClickForeignKey(i);
}
if (getObject('FIELDS')){
getObject('FIELDS').onaddrow = function(iRow) {
oAux = getGridField('FIELDS', iRow, 'FLD_NAME');
leimnud.event.add(oAux, 'change', {method:changeToUpper,instance:oAux,event:true});
oAux = getGridField('FIELDS', iRow, 'FLD_TYPE');
leimnud.event.add(oAux, 'change', {method:onChangeType,instance:oAux,event:true});
//oAux = getGridField('FIELDS', iRow, 'FLD_FOREIGN_KEY');
//leimnud.event.add(oAux, 'click', {method:onClickForeignKey,instance:oAux,event:true});
onChangeType(iRow);
//onClickForeignKey(iRow);
};
}
leimnud.event.add(getField('ADD_TAB_CLASS_NAME'), 'click', function() {
//alert('sss');
});
});
};
};
function cancel(){
window.location = 'additionalTablesList';
window.location = 'additionalTablesList';
}
dynaformOnload = LoadPMTable;
]]>
</JS>