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

import

Browse Source
This commit is contained in:
mcuiza
2016-03-23 15:05:54 -04:00
parent ee37b2fee4
commit 5964c6beb4
2 changed files with 110 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ExportObjects.php
View File

@@ -34,7 +34,12 @@ class ExportObjects
$aObjectsEnable = explode('|', $objectsEnable); $aObjectsEnable = explode('|', $objectsEnable);
foreach ($this->objectsList as $key => $val) { foreach ($this->objectsList as $key => $val) {
$key++; $key++;
$grid[] = array('OBJECT_ID' => $key, 'OBJECT_NAME' => $val, 'OBJECT_ENABLE' => in_array(strtoupper(str_replace(' ', '',$val)), $aObjectsEnable) ); $grid[] = array(
'OBJECT_ID' => $key,
'OBJECT_NAME' => $val,
'OBJECT_ACTION' => 1,
'OBJECT_ENABLE' => in_array(strtoupper(str_replace(' ', '',$val)), $aObjectsEnable)
);
} }
$r = new \stdclass(); $r = new \stdclass();

165
workflow/engine/templates/processes/main.js
View File

@@ -19,6 +19,8 @@ importProcessGlobal.groupBeforeAccion="";
importProcessGlobal.sNewProUid = ""; importProcessGlobal.sNewProUid = "";
importProcessGlobal.importOption = ""; importProcessGlobal.importOption = "";
importProcessGlobal.processFileType = ""; importProcessGlobal.processFileType = "";
importProcessGlobal.isGranularImport = false;
importProcessGlobal.objectGranularImport;
new Ext.KeyMap(document, { new Ext.KeyMap(document, {
key: Ext.EventObject.F5, key: Ext.EventObject.F5,
@@ -988,7 +990,8 @@ function exportImportProcessObjects(typeAction)
fields : [ fields : [
{name : 'OBJECT_ID'}, {name : 'OBJECT_ID'},
{name : 'OBJECT_NAME'}, {name : 'OBJECT_NAME'},
{name : 'OBJECT_ACTION'} {name : 'OBJECT_ACTION'},
{name : 'OBJECT_ENABLE'}
] ]
}) })
}); });
@@ -1016,6 +1019,7 @@ function exportImportProcessObjects(typeAction)
selModel : checkBoxSelMod, selModel : checkBoxSelMod,
showHeaderCheckbox: true, showHeaderCheckbox: true,
columnLines: true, columnLines: true,
//disableSelection : true,
viewConfig: { viewConfig: {
forceFit:true, forceFit:true,
cls:"x-grid-empty", cls:"x-grid-empty",
@@ -1048,7 +1052,8 @@ function exportImportProcessObjects(typeAction)
} }
return storeActionField.getAt(recordIndex).get('text'); return storeActionField.getAt(recordIndex).get('text');
} }
} },
{header: 'Name', dataIndex: 'OBJECT_ENABLE', hidden: true},
] ]
}), }),
store: storeGrid, store: storeGrid,
@@ -1060,9 +1065,16 @@ function exportImportProcessObjects(typeAction)
} else { /*import*/ } else { /*import*/
colModel.setHidden(3, false); colModel.setHidden(3, false);
grid.store.on('load', function(store, records, options){ grid.store.on('load', function(store, records, options){
for(i=0; i<grid.getStore().getTotalCount(); i++){ var gridStore = grid.getStore();
grid.getSelectionModel().selectRow(i, true); gridStore.each(function(row, j){
} if(inArray(row.get('OBJECT_ID'),importProcessGlobal.objectGranularImport)) {
grid.getSelectionModel().selectRow(j, true);
} else {
/*disable row*/
//grid.getSelectionModel().deselectRow(j, true);
return '';
}
});
}); });
} }
} }
@@ -1086,9 +1098,9 @@ function exportImportProcessObjects(typeAction)
text : buttonLabel, text : buttonLabel,
handler : function() { handler : function() {
var selectedObjects = gridProcessObjects.getSelectionModel().getSelections(); var selectedObjects = gridProcessObjects.getSelectionModel().getSelections();
processObjectsArray = [];
if(defaultTypeAction === 'export') { if(defaultTypeAction === 'export') {
if(selectedObjects.length > 0) { if(selectedObjects.length > 0) {
processObjectsArray = [];
for (i = 0; i < selectedObjects.length; i++) { for (i = 0; i < selectedObjects.length; i++) {
processObjectsArray.push(selectedObjects[i].get('OBJECT_ID')); processObjectsArray.push(selectedObjects[i].get('OBJECT_ID'));
} }
@@ -1096,7 +1108,20 @@ function exportImportProcessObjects(typeAction)
exportProcess(); exportProcess();
} }
} else { /*import*/ } else { /*import*/
if(selectedObjects.length > 0) {
for (i = 0; i < selectedObjects.length; i++) {
processObjectsArray.push(
{
id: selectedObjects[i].get('OBJECT_ID'),
action: selectedObjects[i].get('OBJECT_ACTION') === 1 ? 'merge' : 'replace'
}
);
}
processObjectsArray = JSON.stringify(processObjectsArray);
}
Ext.getCmp('objectsToImport').setValue(processObjectsArray);
Ext.getCmp('buttonUpload').el.dom.click();
} }
} }
}, { }, {
@@ -1109,6 +1134,15 @@ function exportImportProcessObjects(typeAction)
}); });
w.show(); w.show();
} }
function inArray(needle, haystack) {
var length = haystack.length;
for(var i = 0; i < length; i++) {
if(haystack[i] == needle) return true;
}
return false;
}
function generateBpmn() function generateBpmn()
{ {
var record = processesGrid.getSelectionModel().getSelections(); var record = processesGrid.getSelectionModel().getSelections();
@@ -1698,6 +1732,11 @@ importProcess = function()
name: 'generateUid', name: 'generateUid',
xtype: 'hidden', xtype: 'hidden',
value: '' value: ''
}, {
id: 'objectsToImport',
name: 'objectsToImport',
xtype: 'hidden',
value: ''
} }
], ],
buttons : [{ buttons : [{
@@ -1723,68 +1762,72 @@ importProcess = function()
success: function(o, resp) success: function(o, resp)
{ {
var resp_ = Ext.util.JSON.decode(resp.response.responseText); var resp_ = Ext.util.JSON.decode(resp.response.responseText);
if(resp_.isGranularImport) {
importProcessGlobal.isGranularImport = resp_.isGranularImport;
importProcessGlobal.objectGranularImport = resp_.objectGranularImport;
exportImportProcessObjects('import');
} else {
if (resp_.status) {
if (resp_.status == "DISABLED-CODE") {
Ext.MessageBox.show({
title: _("ID_ERROR"),
msg: "<div style=\"overflow: auto; width: 500px; height: 150px;\">" + stringReplace("\\x0A", "<br />", resp_.message) + "</div>", //\n 10
width: 570,
height: 250,
icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK
});
if (resp_.status) {
if (resp_.status == "DISABLED-CODE") {
Ext.MessageBox.show({
title: _("ID_ERROR"),
msg: "<div style=\"overflow: auto; width: 500px; height: 150px;\">" + stringReplace("\\x0A", "<br />", resp_.message) + "</div>", //\n 10
width: 570,
height: 250,
icon: Ext.MessageBox.ERROR,
buttons: Ext.MessageBox.OK
});
return;
}
}
if (resp_.catchMessage == "") {
if (resp_.ExistProcessInDatabase == "0") {
if(resp_.notExistProcessInDatabase == "1") {
importProcessGlobal.sNewProUid = resp_.sNewProUid;
importProcessGlobal.proFileName = resp_.proFileName;
importProcessGlobal.groupBeforeAccion = resp_.groupBeforeAccion;
changeOrKeepUids();
return; return;
} }
if (resp_.ExistGroupsInDatabase == "0") { }
var sNewProUid = resp_.sNewProUid;
if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") { if (resp_.catchMessage == "") {
if (typeof(resp_.project_type_aux) != "undefined" && resp_.project_type_aux == "NORMAL") { if (resp_.ExistProcessInDatabase == "0") {
importProcessCallbackFile = false; if(resp_.notExistProcessInDatabase == "1") {
} importProcessGlobal.sNewProUid = resp_.sNewProUid;
var goTo = importProcessCallbackFile ? importProcessCallbackFile : "../designer?prj_uid="; importProcessGlobal.proFileName = resp_.proFileName;
openWindowIfIE(goTo + sNewProUid); importProcessGlobal.groupBeforeAccion = resp_.groupBeforeAccion;
} else { changeOrKeepUids();
window.location.href = "processes_Map?PRO_UID=" + sNewProUid; return;
} }
} else { if (resp_.ExistGroupsInDatabase == "0") {
affectedGroups = resp_.affectedGroups; var sNewProUid = resp_.sNewProUid;
importProcessGlobal.sNewProUid = resp_.sNewProUid; if (typeof(resp_.project_type) != "undefined" && resp_.project_type == "bpmn") {
importProcessGlobal.proFileName = resp_.proFileName; if (typeof(resp_.project_type_aux) != "undefined" && resp_.project_type_aux == "NORMAL") {
importProcessGlobal.groupBeforeAccion = resp_.groupBeforeAccion; importProcessCallbackFile = false;
importProcessExistGroup(); }
var goTo = importProcessCallbackFile ? importProcessCallbackFile : "../designer?prj_uid=";
openWindowIfIE(goTo + sNewProUid);
} else {
window.location.href = "processes_Map?PRO_UID=" + sNewProUid;
}
} else {
affectedGroups = resp_.affectedGroups;
importProcessGlobal.sNewProUid = resp_.sNewProUid;
importProcessGlobal.proFileName = resp_.proFileName;
importProcessGlobal.groupBeforeAccion = resp_.groupBeforeAccion;
importProcessExistGroup();
}
} else if (resp_.ExistProcessInDatabase == "1") {
importProcessGlobal.proFileName = resp_.proFileName;
importProcessExistProcess();
}
} else {
w.close();
if (Ext.getCmp('changeOrKeepUidsWindow')) {
Ext.getCmp('changeOrKeepUidsWindow').close();
} }
} else if (resp_.ExistProcessInDatabase == "1") {
importProcessGlobal.proFileName = resp_.proFileName;
importProcessExistProcess();
}
} else {
w.close();
if (Ext.getCmp('changeOrKeepUidsWindow')) {
Ext.getCmp('changeOrKeepUidsWindow').close();
}
Ext.MessageBox.show({ Ext.MessageBox.show({
title : "", title : "",
msg : resp_.catchMessage, msg : resp_.catchMessage,
buttons: Ext.MessageBox.OK, buttons: Ext.MessageBox.OK,
animEl : "mb9", animEl : "mb9",
fn : function(){}, fn : function(){},
icon : Ext.MessageBox.ERROR icon : Ext.MessageBox.ERROR
}); });
}
} }
}, },
failure : function(o, resp) failure : function(o, resp)