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

WebEntry Fixed

Browse Source
This commit is contained in:
girish
2011-02-21 09:11:51 +00:00
parent 2490559bd4
commit ee72bda74a
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4548,7 +4548,7 @@ class processMap {
if (!is_null($oEvent)) { if (!is_null($oEvent)) {
$oData = $oEvent->load($sEventUID); $oData = $oEvent->load($sEventUID);
if($oData['EVN_ACTION'] != '' && $oData['EVN_ACTION'] != 'WEB_ENTRY') if($oData['EVN_ACTION'] != '' && $oData['EVN_ACTION'] == 'WEB_ENTRY')
{ {
require_once 'classes/model/Content.php'; require_once 'classes/model/Content.php';
$oContent = new Content(); $oContent = new Content();
@@ -6566,7 +6566,7 @@ function saveExtddEvents($oData)
$aData['EVN_RELATED_TO'] = 'MULTIPLE'; $aData['EVN_RELATED_TO'] = 'MULTIPLE';
} }
if(preg_match("/Start/", $aData['EVN_TYPE'])){ if(preg_match("/Start/", $aData['EVN_TYPE'])){
$aData['EVN_RELATED_TO'] = 'SINGLE'; $aData['EVN_RELATED_TO'] = 'MULTIPLE';
} }
$sEvn_uid = $oData->evn_uid; $sEvn_uid = $oData->evn_uid;
$oEventData = EventPeer::retrieveByPK($sEvn_uid); $oEventData = EventPeer::retrieveByPK($sEvn_uid);

12
workflow/engine/methods/processes/processes_webEntryGenerate.php
View File

@@ -108,10 +108,18 @@ try {
$template->prepare (); $template->prepare ();
file_put_contents ( $fileName, $template->getOutputContent () ); file_put_contents ( $fileName, $template->getOutputContent () );
} }
require_once 'classes/model/Event.php';
$oEvent = new Event ( );
$aDataEvent = array();
$aDataEvent['EVN_UID'] = $oData->WE_EVN_UID;
$aDataEvent['EVN_RELATED_TO'] = 'MULTIPLE';
$aDataEvent['EVN_ACTION'] = $sDYNAFORM;
$output = $oEvent->update($aDataEvent);
//Show link //Show link
$link = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/' . $sPRO_UID . '/' . $dynTitle . '.php'; $link = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/' . $sPRO_UID . '/' . $dynTitle . '.php';
//print "\n<a href='$link' target='_new' > $link </a>"; print "\n<a href='$link' target='_new' > $link </a>";
} else { } else {

3
workflow/engine/templates/bpmn/MyWorkflow.js
View File

@@ -1085,8 +1085,7 @@ MyWorkflow.prototype.saveShape= function(oNewShape)
urlparams = '?action='+actiontype+'&data={"tas_uid":"'+tas_uid+'","tas_start":"'+tas_start+'"}'; urlparams = '?action='+actiontype+'&data={"tas_uid":"'+tas_uid+'","tas_start":"'+tas_start+'"}';
break; break;
case 'addEvent': case 'addEvent':
var tas_uid=''; urlparams = '?action='+actiontype+'&data={"uid":"'+ pro_uid +'","evn_type":"'+shapetype+'","position":'+pos+',"evn_uid":"'+shapeId+'"}';
urlparams = '?action='+actiontype+'&data={"uid":"'+ pro_uid +'","tas_uid":"'+tas_uid+'","evn_type":"'+shapetype+'","position":'+pos+',"evn_uid":"'+shapeId+'"}';
break; break;
case 'updateEvent': case 'updateEvent':
urlparams = '?action='+actiontype+'&data={"evn_uid":"'+shapeId +'","evn_type":"'+shapetype+'"}'; urlparams = '?action='+actiontype+'&data={"evn_uid":"'+shapeId +'","evn_type":"'+shapetype+'"}';

6
workflow/engine/templates/bpmn/pmosExt.js
View File

@@ -289,7 +289,7 @@ pmosExt.prototype.popWebEntry= function(_5678)
collapsible: false, collapsible: false,
maximizable: false, maximizable: false,
width: 450, width: 450,
height: 450, height: 350,
minWidth: 300, minWidth: 300,
minHeight: 200, minHeight: 200,
layout: 'fit', layout: 'fit',
@@ -334,14 +334,14 @@ pmosExt.prototype.popWebEntry= function(_5678)
var webEntryLink = workflow.webForm.items.items[0].items.items; var webEntryLink = workflow.webForm.items.items[0].items.items;
var propertiesfields = workflow.webForm.items.items[1].items.items; var propertiesfields = workflow.webForm.items.items[1].items.items;
var credentialFields = workflow.webForm.items.items[2].items.items; var credentialFields = workflow.webForm.items.items[2].items.items;
var evn_uid = workflow.currentSelection.id;
var task_uid = propertiesfields[0].getValue(); var task_uid = propertiesfields[0].getValue();
var dyna_uid = propertiesfields[1].getValue(); var dyna_uid = propertiesfields[1].getValue();
var we_type = propertiesfields[2].getValue(); var we_type = propertiesfields[2].getValue();
var we_usr = propertiesfields[3].getValue(); var we_usr = propertiesfields[3].getValue();
var tasName = 'test';
var username = credentialFields[0].getValue(); var username = credentialFields[0].getValue();
var password = credentialFields[1].getValue(); var password = credentialFields[1].getValue();
var args = '?action=webEntry_generate&data={"PRO_UID":"'+pro_uid +'", "TASKS":"'+task_uid+'", "DYNAFORM":"'+dyna_uid+'", "WE_TYPE":"'+we_type+'", "WS_USER":"'+username+'", "WS_PASS":"'+password+'", "WS_ROUNDROBIN":"", "WE_USR":"'+we_usr+'"}'; var args = '?action=webEntry_generate&data={"PRO_UID":"'+pro_uid +'", "TASKS":"'+task_uid+'", "DYNAFORM":"'+dyna_uid+'", "WE_TYPE":"'+we_type+'", "WS_USER":"'+username+'", "WS_PASS":"'+password+'", "WS_ROUNDROBIN":"", "WE_USR":"'+we_usr+'", "WE_EVN_UID":"'+evn_uid+'"}';
Ext.Ajax.request({ Ext.Ajax.request({
url: 'processes_Ajax.php'+ args, url: 'processes_Ajax.php'+ args,
success: function(response) { success: function(response) {