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

Worked on assigning and removing users in Users and user groups(Ad hoc) Extjs

Browse Source
This commit is contained in:
safan
2011-01-08 11:37:16 +00:00
parent 453d6f4fb2
commit 865dc00eca
4 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5781,16 +5781,17 @@ class processMap {
$_DBArray = (isset($_SESSION ['_DBArray']) ? $_SESSION ['_DBArray'] : '');
$_DBArray ['availableUsers'] = $aUsers;
$_SESSION ['_DBArray'] = $_DBArray;
G::LoadClass('ArrayPeer');
$oCriteria = new Criteria('dbarray');
$oCriteria->setDBArrayTable('availableUsers');
$oCriteria->addDescendingOrderByColumn(TaskUserPeer::TU_RELATION);
$oCriteria->addAscendingOrderByColumn('LABEL');
return $_SESSION ['_DBArray']['availableUsers'];
return $oCriteria;
} catch (Exception $oError) {
throw ($oError);
}
}
function getExtusersadhoc($sProcessUID = '', $sTaskUID = '') {
try {
$oProcess = new Process ( );
@@ -5820,13 +5821,13 @@ class processMap {
$oTask = new Task ( );
$aTask = $oTask->load($sTaskUID);
$G_PUBLISH->AddContent('propeltable', 'paged-table', 'users/users_ShortListAdhoc', $this->getTaskUsersCriteria($sTaskUID, $_SESSION ['iType']), $aFields);
$this->getExtTaskUsersCriteria ( $sTaskUID, $_SESSION ['iType'] );
return $_SESSION ['_DBArray']['taskUsers'];
G::RenderPage('publish', 'raw');
return true;
} catch (Exception $oError) {
} catch ( Exception $oError ) {
throw ($oError);
}
}
}

16
workflow/engine/methods/bpmn/proxyExtjs.php
View File

@@ -71,6 +71,12 @@ switch($_GET['action'])
$rows = $oProcessMap->getExtReportTables($_GET['pid']);
break;
case 'editReportTables':
require_once 'classes/model/ReportTable.php';
$oReportTable = new ReportTable();
$rows = $oReportTable->load($_GET['REP_TAB_UID']);
break;
case 'getReportTableType':
if(isset($_GET['pid']) && $_GET['type'] == 'NORMAL')
{
@@ -167,13 +173,13 @@ switch($_GET['action'])
$rows = $oProcessMap->getExtAvailableUsersList($_GET['tid']);
break;
case 'assignedUsers':
$rows = $oProcessMap->getExtusersadhoc($_GET['pid'], $_GET['tid']);
array_shift($rows);
break;
case 'assignedUsers':
$rows = $oProcessMap->getExtusersadhoc($_GET['pid'], $_GET['tid']);
array_shift($rows);
break;
}
//$result['totalCount'] = count($rows);
//$result['totalCount'] = count($rows);
//$result['data'] = $rows;
//print json_encode( $result ) ;
$tmpData = json_encode( $rows ) ;

42
workflow/engine/templates/bpmn/ProcessOptions.js
View File

@@ -854,6 +854,7 @@ ProcessOptions.prototype.dbConnection = function()
},{
xtype: 'textfield',
fieldLabel: 'Password',
inputType:'password',
name: 'DBS_PASSWORD',
allowBlank: true
},{
@@ -1283,14 +1284,14 @@ ProcessOptions.prototype.addInputDoc= function(_5625)
var tb = new Ext.Toolbar({
items: [btnAdd, btnRemove,btnEdit]
items: [btnAdd, btnRemove, btnEdit]
});
var inputDocGrid = new Ext.grid.GridPanel({
store: inputDocStore,
id : 'mygrid',
loadMask: true,
loadingText: 'Loading...',
//loadingText: 'Loading...',
renderTo: 'cases-grid',
frame: false,
autoHeight:false,
@@ -2059,8 +2060,32 @@ ProcessOptions.prototype.addReportTable= function(_5625)
}
});
var btnEdit = new Ext.Button({
id: 'btnEdit',
text: 'Edit',
iconCls: 'application_add',
handler: function (s) {
var s = reportGrid.getSelectionModel().getSelections();
var repTabUID = s[0].data.REP_TAB_UID;
reportForm.form.load({
url:'proxyExtjs.php?REP_TAB_UID='+repTabUID+'&action=editReportTables',
method:'GET',
waitMsg:'Loading',
success:function(form, action) {
formWindow.show();
//Ext.MessageBox.alert('Message', 'Loaded OK');
// setTaskAssignType(form);
},
failure:function(form, action) {
Ext.MessageBox.alert('Message', 'Load failed');
}
});
}
});
var btnRemove = new Ext.Button({
id: 'btnAdd',
id: 'btnRemove',
text: 'Delete Report Table',
iconCls: 'application_add',
handler: function () {
@@ -2093,14 +2118,15 @@ ProcessOptions.prototype.addReportTable= function(_5625)
var tb = new Ext.Toolbar({
items: [btnAdd,btnRemove]
items: [btnAdd,btnRemove, btnEdit]
});
var reportGrid = new Ext.grid.GridPanel({
store : reportStore,
id : 'mygrid',
loadMask : true,
loadingText : 'Loading...',
//loadingText : 'Loading...',
renderTo : 'cases-grid',
frame : false,
autoHeight :false,
@@ -2182,7 +2208,7 @@ var reportForm =new Ext.FormPanel({
Ext.getCmp("gridfields").show();
Ext.getCmp("fields").hide();
}
var link = 'proxyReportTables?pid='+pro_uid+'&type='+record.data.value+'action=getReportTableType';
var link = 'proxyReportTables?pid='+pro_uid+'&type='+record.data.value+'&action=getReportTableType';
reportStore.proxy.setUrl(link, true);
reportStore.load();
@@ -2251,7 +2277,7 @@ var formWindow = new Ext.Window({
text: 'Save',
handler: function(){
var getForm = reportForm.getForm().getValues();
var pro_uid = getForm.PRO_UID;
//var pro_uid = getForm.PRO_UID;
var tableUID = getForm.REP_TAB_UID;
var Title = getForm.REP_TAB_TITLE;
var Name = getForm.REP_TAB_NAME;
@@ -2267,7 +2293,7 @@ var formWindow = new Ext.Window({
// var VariableType = getForm.REP_VAR_TYPE;
// var Connection = getForm.REP_TAB_CONNECTION
if(tableUID=='')
if(typeof tableUID=='undefined')
{
Ext.Ajax.request({
url : '../reportTables/reportTables_Save.php',

20
workflow/engine/templates/bpmn/TaskContext.js
View File

@@ -2028,7 +2028,7 @@ TaskContext.prototype.editUsersAdHoc= function(_5625)
});
var window = new Ext.Window({
title: 'Users and User Groups',
title: 'Users and User Groups(Ad Hoc)',
collapsible: false,
maximizable: false,
width: 400,
@@ -2040,22 +2040,6 @@ TaskContext.prototype.editUsersAdHoc= function(_5625)
bodyStyle: 'padding:5px;',
buttonAlign: 'center',
items: panel
/*buttons: [{
text: 'Save',
handler: function(){
Ext.MessageBox.alert ("User has been successfully assigned");
//var getstore = grid.getStore();
//var getData = getstore.data.items;
//taskExtObj.saveTaskUsers(getData);
}
},{
text: 'Cancel',
handler: function(){
// when this button clicked,
window.close();
}
}]*/
});
});
window.show();
}