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

Adjustments in the creation and modification of a PMTable, in the selection of key and Null

Browse Source
This commit is contained in:
Hector Cortez
2011-01-26 20:50:40 +00:00
parent c290f5bbf8
commit 3b5414df51
5 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/methods/additionalTables/additionalTablesSave.php
View File

@@ -58,7 +58,22 @@ foreach ($_POST['form']['FIELDS'] as $iRow => $aRow) {
if (!isset($_POST['form']['FIELDS'][$iRow]['FLD_FOREIGN_KEY_TABLE'])) {
$_POST['form']['FIELDS'][$iRow]['FLD_FOREIGN_KEY_TABLE'] = '';
}
if (!isset($_POST['form']['FIELDS'][$iRow]['FLD_NULL_HDN'])) {
$_POST['form']['FIELDS'][$iRow]['FLD_NULL_HDN'] = '';
}
if (!isset($_POST['form']['FIELDS'][$iRow]['FLD_KEY_HDN'])) {
$_POST['form']['FIELDS'][$iRow]['FLD_KEY_HDN'] = '';
}
// replace values check
if (isset($_POST['form']['FIELDS'][$iRow]['FLD_KEY']) && $_POST['form']['FIELDS'][$iRow]['FLD_KEY_HDN'] == 'on') {
$_POST['form']['FIELDS'][$iRow]['FLD_KEY'] = $_POST['form']['FIELDS'][$iRow]['FLD_KEY_HDN'];
}
if (isset($_POST['form']['FIELDS'][$iRow]['FLD_NULL']) && $_POST['form']['FIELDS'][$iRow]['FLD_NULL_HDN'] == 'on') {
$_POST['form']['FIELDS'][$iRow]['FLD_NULL'] = $_POST['form']['FIELDS'][$iRow]['FLD_NULL_HDN'];
}
}
$aKeys = array();
$aDynavars = array();
$aNoKeys = array();

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

@@ -287,11 +287,17 @@ var verifyData = function(oForm) {
}
}
}
var bContinueKey = false;
var bContinueKey = false;
for (var i = 1; i <= iRows; i++) {
if (getGridField('FIELDS', i, 'FLD_KEY').checked) {
bContinueKey = true;
}
if (getGridField('FIELDS', i, 'FLD_KEY').checked) {
getGridField('FIELDS', i, 'FLD_KEY_HDN').value = "on" ;
}
if (getGridField('FIELDS', i, 'FLD_NULL').checked) {
getGridField('FIELDS', i, 'FLD_NULL_HDN').value = "on" ;
}
}
if (bContinue && bContinueKey) {
oForm.submit();
@@ -365,7 +371,10 @@ var changeValues = function(iRow, sType) {
var FLD_SIZE = getGridField('FIELDS', iOtherRow, 'FLD_SIZE').value;
var FLD_NULL = getGridField('FIELDS', iOtherRow, 'FLD_NULL').checked;
var FLD_KEY = getGridField('FIELDS', iOtherRow, 'FLD_KEY').checked;
var FLD_NULL_HDN = getGridField('FIELDS', iOtherRow, 'FLD_NULL_HDN').value;
var FLD_KEY_HDN = getGridField('FIELDS', iOtherRow, 'FLD_KEY_HDN').value;
getGridField('FIELDS', iOtherRow, 'FLD_UID').value = getGridField('FIELDS', iRow, 'FLD_UID').value;
getGridField('FIELDS', iOtherRow, 'FLD_NAME').value = getGridField('FIELDS', iRow, 'FLD_NAME').value;
getGridField('FIELDS', iOtherRow, 'FLD_DESCRIPTION').value = getGridField('FIELDS', iRow, 'FLD_DESCRIPTION').value;
@@ -374,6 +383,10 @@ var changeValues = function(iRow, sType) {
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;
@@ -382,6 +395,10 @@ var changeValues = function(iRow, sType) {
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);
};
@@ -410,8 +427,9 @@ var dynaformOnload = function() {
onChangeType(iRow, true);
//onClickForeignKey(iRow, true);
document.getElementById('FIELDS').rows[iRow].getElementsByTagName('td')[8].innerHTML = document.getElementById('FIELDS').rows[1].getElementsByTagName('td')[8].innerHTML.replace('[1]', '[' + iRow + ']');
document.getElementById('FIELDS').rows[iRow].getElementsByTagName('td')[9].innerHTML = document.getElementById('FIELDS').rows[1].getElementsByTagName('td')[9].innerHTML.replace('[1]', '[' + iRow + ']');
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 + ']');
};
//
};

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

@@ -23,10 +23,13 @@
<en>Null</en>
</FLD_NULL>
<FLD_KEY type="checkbox" defaultValue="on">
<en>Primary Key</en>
</FLD_KEY>
<FLD_NULL_HDN type="hidden" defaultvalue="" mode="edit" btn_cancel="Cancel">
</FLD_NULL_HDN>
<FLD_KEY_HDN type="hidden" defaultvalue="" mode="edit" btn_cancel="Cancel">
</FLD_KEY_HDN>
</dynaForm>

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

@@ -23,12 +23,15 @@
<en>Null</en>
</FLD_NULL>
<FLD_KEY type="checkbox" defaultValue="on">
<en>Primary Key</en>
</FLD_KEY>
<FLD_NULL_HDN type="hidden" defaultvalue="" mode="edit" btn_cancel="Cancel">
</FLD_NULL_HDN>
<FLD_KEY_HDN type="hidden" defaultvalue="" mode="edit" btn_cancel="Cancel">
</FLD_KEY_HDN>
<FLD_UP_LINK type="link" link="#" onclick="changeValues(this.id.split(&#039;][&#039;)[1], &#039;UP&#039;);return false;" value="@G::LoadTranslation(ID_UP)"/>
<FLD_DOWN_LINK type="link" link="#" onclick="changeValues(this.id.split(&#039;][&#039;)[1], &#039;DOWN&#039;);return false;" value="@G::LoadTranslation(ID_DOWN)"/>

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

@@ -290,6 +290,12 @@ var verifyData = function(oForm) {
if (getGridField('FIELDS', i, 'FLD_KEY').checked) {
bContinueKey = true;
}
if (getGridField('FIELDS', i, 'FLD_KEY').checked) {
getGridField('FIELDS', i, 'FLD_KEY_HDN').value = "on" ;
}
if (getGridField('FIELDS', i, 'FLD_NULL').checked) {
getGridField('FIELDS', i, 'FLD_NULL_HDN').value = "on" ;
}
}
if (bContinue && bContinueKey) {
oForm.submit();