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

BUG 7598 "New Feature about the process information"

Browse Source 
- Added an option to hide the process information on start case panel
-- the option is in ADMIN->Environments->Hide Process Information checkbox
This commit is contained in:
Erik Amaru Ortiz
2011-10-19 09:15:51 -04:00
parent 11f1cc7b5e
commit a7e4126f95
7 changed files with 155 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
workflow/engine/classes/class.configuration.php
View File

@@ -289,14 +289,29 @@ class Configurations // extends Configuration
*/
function getFormats(){
if (!isset($this->UserConfig)) $this->UserConfig = $this->getConfiguration('ENVIRONMENT_SETTINGS', '');
$formats = Array();
$formats['FullNameFormat'] = isset($this->UserConfig['format']) ? $this->UserConfig['format'] : '@lastName, @firstName (@userName)';
$formats['DateFormat'] = isset($this->UserConfig['dateFormat']) ? $this->UserConfig['dateFormat'] : 'm/d/Y';
$formats['CasesListDateFormat'] = isset($this->UserConfig['casesListDateFormat']) ? $this->UserConfig['casesListDateFormat'] : 'm/d/Y';
$formats['CasesListRowNumber'] = isset($this->UserConfig['casesListRowNumber']) ? $this->UserConfig['casesListRowNumber'] : '10';
$formats['TimeZone'] = date('T');
return $formats;
if (!isset($this->UserConfig)) {
$this->UserConfig = $this->getConfiguration('ENVIRONMENT_SETTINGS', '');
}
// setting defaults
if (!isset($this->UserConfig['format'])) {
$this->UserConfig['format'] = '@lastName, @firstName (@userName)';
}
if (!isset($this->UserConfig['dateFormat'])) {
$this->UserConfig['dateFormat'] = 'Y-m-d H:i:s';
}
if (!isset($this->UserConfig['casesListDateFormat'])) {
$this->UserConfig['casesListDateFormat'] = 'Y-m-d H:i:s';
}
if (!isset($this->UserConfig['casesListRowNumber'])) {
$this->UserConfig['CasesListRowNumber'] = '25';
}
if (!isset($this->UserConfig['startCaseHideProcessInf'])) {
$this->UserConfig['startCaseHideProcessInf'] = false;
}
$this->UserConfig['TimeZone'] = date('T');
return $this->UserConfig;
}

54
workflow/engine/methods/cases/casesStartPage.php
View File

@@ -9,50 +9,6 @@ if(isset($_GET['action'])){
}
$oHeadPublisher =& headPublisher::getSingleton();
//$oHeadPublisher->setExtSkin( 'xtheme-gray');
//$oHeadPublisher->usingExtJs('ux/TabCloseMenu');
//$oHeadPublisher->usingExtJs('ux/ColumnHeaderGroup');
//G::pr($TRANSLATIONS_STARTCASE);
//print "<br /><br /><br /><br /><center><img src='/images/gears.gif' valign='absmiddle' width='35'><br />".G::LoadTranslation('ID_LOADING')."</center>";
$loadingHTML ='
<style>
#loading{
left:40%;
top:37%;
padding:2px;
height:auto;
}
#loading .loading-indicator{
background:white;
color:#444;
font:bold 13px tahoma,arial,helvetica;
padding:10px;
margin:0;
height:auto;
}
#loading-msg {
font: bold 11px arial,tahoma,sans-serif;
}
</style>
<div id="loading">
<div class="loading-indicator">
<center>
<img src="/images/gears.gif" valign="absmiddle" width="35"><br />
<span id="loading-msg">'.G::LoadTranslation('ID_LOADING').'</span><br />
</center>
</div>
</div>
';
//print_r($loadingHTML);
switch($page){
case "startCase":
@@ -61,6 +17,9 @@ switch($page){
$oHeadPublisher->addExtJsScript('cases/casesStartCase', true); //adding a javascript file .js
$oHeadPublisher->addContent( 'cases/casesStartCase'); //adding a html file .html.
G::LoadClass('configuration');
$c = new Configurations();
$oHeadPublisher->assign('FORMATS',$c->getFormats());
break;
case "documents":
@@ -69,8 +28,6 @@ switch($page){
$configPage = $c->getConfiguration('documentsModule', 'pageSize','',$_SESSION['USER_LOGGED']);
$configEnv = $c->getConfiguration('ENVIRONMENT_SETTINGS', '');
$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
//$Config['fullNameFormat'] = isset($configEnv['format']) ? $configEnv['format'] : '@userName';
//$Config['dateFormat'] = isset($configEnv['dateFormat']) ? $configEnv['dateFormat'] : 'Y-m-d';
$oHeadPublisher->assign('CONFIG', $Config);
$oHeadPublisher->assign('FORMATS',$c->getFormats());
@@ -82,11 +39,6 @@ switch($page){
$oHeadPublisher->addContent( 'cases/casesDocuments'); //adding a html file .html.
break;
default:
// $oHeadPublisher->usingExtJs('ux.treefilterx/Ext.ux.tree.TreeFilterX');
//
// $oHeadPublisher->usingExtJs('ux.locationbar/Ext.ux.LocationBar');
// $oHeadPublisher->usingExtJs('ux.statusbar/ext-statusbar');
$oHeadPublisher->addExtJsScript('cases/casesStartPage', false); //adding a javascript file .js
$oHeadPublisher->addContent( 'cases/casesStartPage'); //adding a html file .html.
break;

27
workflow/engine/methods/setup/environmentSettings.php
View File

@@ -1,31 +1,8 @@
<?php
G::loadClass('configuration');
$c = new Configurations;
//$oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS','');
//translations array
// $translations = G::getTranslations(Array(
// 'ID_PM_ENV_SETTINGS_TITLE', 'ID_PM_ENV_SETTINGS_USERFIELDSET_TITLE', 'IS_USER_NAME_DISPLAY_FORMAT', 'ID_SAVE_SETTINGS',
// 'ID_LAN_UPDATE_DATE', 'ID_SAVING_ENVIRONMENT_SETTINGS', 'ID_ENVIRONMENT_SETTINGS_MSG_1',
// 'ID_PM_ENV_SETTINGS_REGIONFIELDSET_TITLE', 'ID_GLOBAL_DATE_FORMAT', 'ID_PM_ENV_SETTINGS_CASESLIST_TITLE', 'ID_CASES_ROW_NUMBER', 'ID_CASES_DATE_MASK'
// ));
// $defaultOption = isset($oConf->aConfig['format'])? $oConf->aConfig['format']: '';
// $defaultDateOption = isset($oConf->aConfig['dateFormat'])? $oConf->aConfig['dateFormat']: '';
// $defaultCasesListDateOption = isset($oConf->aConfig['casesListDateFormat'])? $oConf->aConfig['casesListDateFormat']: '';
// $defaultCasesListRowOption = isset($oConf->aConfig['casesListRowNumber']) ? $oConf->aConfig['casesListRowNumber'] : '';
//
$oHeadPublisher =& headPublisher::getSingleton();
$oHeadPublisher->addExtJsScript('setup/environmentSettings', false );
// $oHeadPublisher->assign('default_format', $defaultOption);
// $oHeadPublisher->assign('default_date_format', $defaultDateOption);
// $oHeadPublisher->assign('default_caseslist_date_format', $defaultCasesListDateOption);
// $oHeadPublisher->assign('default_caseslist_row_number', $defaultCasesListRowOption);
//
//
//
// $oHeadPublisher->assign('dateFormatsList', Configurations::getDateFormats());
//
// $oHeadPublisher->assign('TRANSLATIONS', $translations);
$oHeadPublisher->addExtJsScript('setup/environmentSettings', true);
//$conf->aConfig['startCaseHideProcessInf']
$oHeadPublisher->assign('FORMATS',$c->getFormats());
G::RenderPage('publish', 'extJs');

2
workflow/engine/methods/setup/environmentSettingsAjax.php
View File

@@ -43,6 +43,8 @@
'casesListDateFormat' =>$_POST['casesListDateFormat'],
'casesListRowNumber' =>$_POST['casesListRowNumber']
);
$conf->aConfig['startCaseHideProcessInf'] = isset($_POST['hideProcessInf']) ? true : false;
$conf->saveConfig('ENVIRONMENT_SETTINGS', '');
$response = new StdClass();

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

@@ -283,8 +283,6 @@ Ext.onReady(function() {
layout : 'border',
items : [newCaseTree, details]
});
//PMExt.info('x', 'ddd');
//viewport.doLayout();
//routine to hide the debug panel if it is open
if( typeof parent != 'undefined' ){
@@ -295,6 +293,10 @@ Ext.onReady(function() {
}
}
if (FORMATS.startCaseHideProcessInf) {
Ext.getCmp('process-detail-panel').hide();
Ext.getCmp('startCaseTreePanel').ownerCt.doLayout();
}
});
function openCaseA(n){

224
workflow/engine/templates/setup/environmentSettings.js
View File

@@ -14,31 +14,29 @@ Ext.onReady(function() {
_dateSample = '2011-02-17 19:15:38';
fsSample = new Ext.form.FieldSet({
title: _('ID_SAMPLES'),
labelWidth: 250,
autoHeight: true,
items: [
{xtype: 'label', fieldLabel: _('IS_USER_NAME_DISPLAY_FORMAT'), id: 'lblFullName', width: 400},
{xtype: 'label', fieldLabel: _('ID_GLOBAL_DATE_FORMAT'), id: 'lblDateFormat', width: 400},
{xtype: 'label', fieldLabel: _('ID_CASE_LIST') +': '+_('ID_CASES_DATE_MASK'), id: 'lblCasesDateFormat', width: 400},
{xtype: 'label', fieldLabel: _('ID_CASE_LIST') +': '+_('ID_CASES_ROW_NUMBER'), id: 'lblCasesRowsList', width: 400}
]
title: _('ID_SAMPLES'),
labelWidth: 250,
autoHeight: true,
frame: true,
items: [
{xtype: 'label', fieldLabel: _('IS_USER_NAME_DISPLAY_FORMAT'), id: 'lblFullName', width: 400},
{xtype: 'label', fieldLabel: _('ID_GLOBAL_DATE_FORMAT'), id: 'lblDateFormat', width: 400},
{xtype: 'label', fieldLabel: _('ID_CASE_LIST') +': '+_('ID_CASES_DATE_MASK'), id: 'lblCasesDateFormat', width: 400},
{xtype: 'label', fieldLabel: _('ID_CASE_LIST') +': '+_('ID_CASES_ROW_NUMBER'), id: 'lblCasesRowsList', width: 400}
]
});
storeUsernameFormat = new Ext.data.GroupingStore({
proxy : new Ext.data.HttpProxy({
url: 'environmentSettingsAjax?request=getUserMaskList'
}),
reader : new Ext.data.JsonReader({
root: 'rows',
fields : [
{name : 'id'},
{name : 'name'}
]
}),
proxy : new Ext.data.HttpProxy({
url: 'environmentSettingsAjax?request=getUserMaskList'
}),
reader : new Ext.data.JsonReader({
root: 'rows',
fields : [{name : 'id'}, {name : 'name'}]
}),
listeners:{
load: function(){
default_format = FORMATS.FullNameFormat;
default_format = FORMATS.format;
i = cmbUsernameFormats.store.findExact('id', default_format, 0);
cmbUsernameFormats.setValue(cmbUsernameFormats.store.getAt(i).data.id);
cmbUsernameFormats.setRawValue(cmbUsernameFormats.store.getAt(i).data.name);
@@ -54,12 +52,11 @@ Ext.onReady(function() {
displayField : 'name',
triggerAction : 'all',
emptyText : _('ID_SELECT'),
//selectOnFocus : true,
editable : false,
allowBlank : false,
width: 400,
allowBlankText : _('ID_ENVIRONMENT_SETTINGS_MSG_1'),
mode:'local',
width: 400,
listeners:{
afterrender:function(){
cmbUsernameFormats.store.load();
@@ -82,7 +79,7 @@ Ext.onReady(function() {
}),
listeners:{
load: function(){
default_date_format = FORMATS.DateFormat,
default_date_format = FORMATS.dateFormat,
i = cmbDateFormats.store.findExact('id', default_date_format, 0);
cmbDateFormats.setValue(cmbDateFormats.store.getAt(i).data.id);
cmbDateFormats.setRawValue(cmbDateFormats.store.getAt(i).data.name);
@@ -99,10 +96,8 @@ Ext.onReady(function() {
displayField : 'name',
triggerAction : 'all',
emptyText : _('ID_SELECT'),
selectOnFocus : true,
editable : false,
allowBlank : false,
width: 300,
allowBlankText : _('ID_ENVIRONMENT_SETTINGS_MSG_1'),
mode:'local',
listeners:{
@@ -113,26 +108,26 @@ Ext.onReady(function() {
}
});
storeCaseUserNameFormat = new Ext.data.Store( {
storeCaseUserNameFormat = new Ext.data.Store({
proxy : new Ext.data.HttpProxy({
url : 'environmentSettingsAjax?request=getCasesListDateFormat',
method : 'POST'
url : 'environmentSettingsAjax?request=getCasesListDateFormat',
method : 'POST'
}),
reader: new Ext.data.JsonReader({
root: 'rows',
fields: [
{name: 'id'},
{name : 'name'}
]
}),
listeners:{
load: function(){
default_caseslist_date_format = FORMATS.CasesListDateFormat;
i = cmbCasesDateFormats.store.findExact('id', default_caseslist_date_format, 0);
cmbCasesDateFormats.setValue(cmbCasesDateFormats.store.getAt(i).data.id);
cmbCasesDateFormats.setRawValue(cmbCasesDateFormats.store.getAt(i).data.name);
}
}
reader: new Ext.data.JsonReader({
root: 'rows',
fields: [
{name: 'id'},
{name : 'name'}
]
}),
listeners:{
load: function(){
default_caseslist_date_format = FORMATS.casesListDateFormat;
i = cmbCasesDateFormats.store.findExact('id', default_caseslist_date_format, 0);
cmbCasesDateFormats.setValue(cmbCasesDateFormats.store.getAt(i).data.id);
cmbCasesDateFormats.setRawValue(cmbCasesDateFormats.store.getAt(i).data.name);
}
}
});
cmbCasesDateFormats = new Ext.form.ComboBox({
@@ -143,10 +138,8 @@ Ext.onReady(function() {
displayField : 'name',
triggerAction : 'all',
emptyText : _('ID_SELECT'),
//selectOnFocus : true,
editable : false,
allowBlank : false,
width: 300,
allowBlankText : _('ID_ENVIRONMENT_SETTINGS_MSG_1'),
mode:'local',
listeners:{
@@ -158,27 +151,27 @@ Ext.onReady(function() {
});
storeCaseListNumber = new Ext.data.Store({
proxy : new Ext.data.HttpProxy( {
url : 'environmentSettingsAjax?request=getCasesListRowNumber',
method : 'POST'
}),
reader: new Ext.data.JsonReader( {
root: 'rows',
fields :[
{name : 'id'},
{name : 'name'}
]
}),
listeners:{
load: function(){
default_caseslist_row_number = FORMATS.CasesListRowNumber;
i = cmbCasesRowsPerPage.store.findExact('id', default_caseslist_row_number, 0);
if( i != -1 ){
cmbCasesRowsPerPage.setValue(cmbCasesRowsPerPage.store.getAt(i).data.id);
cmbCasesRowsPerPage.setRawValue(cmbCasesRowsPerPage.store.getAt(i).data.name);
}
}
}
proxy : new Ext.data.HttpProxy( {
url : 'environmentSettingsAjax?request=getCasesListRowNumber',
method : 'POST'
}),
reader: new Ext.data.JsonReader( {
root: 'rows',
fields :[
{name : 'id'},
{name : 'name'}
]
}),
listeners:{
load: function(){
default_caseslist_row_number = FORMATS.casesListRowNumber;
i = cmbCasesRowsPerPage.store.findExact('id', default_caseslist_row_number, 0);
if( i != -1 ){
cmbCasesRowsPerPage.setValue(cmbCasesRowsPerPage.store.getAt(i).data.id);
cmbCasesRowsPerPage.setRawValue(cmbCasesRowsPerPage.store.getAt(i).data.name);
}
}
}
});
cmbCasesRowsPerPage = new Ext.form.ComboBox({
@@ -189,10 +182,8 @@ Ext.onReady(function() {
displayField : 'name',
triggerAction : 'all',
emptyText : _('ID_SELECT'),
//selectOnFocus : true,
editable : false,
allowBlank : false,
width: 100,
allowBlankText : _('ID_ENVIRONMENT_SETTINGS_MSG_1'),
mode:'local',
listeners:{
@@ -204,21 +195,44 @@ Ext.onReady(function() {
});
fsNames = new Ext.form.FieldSet({
title: _('ID_PM_ENV_SETTINGS_USERFIELDSET_TITLE'),
labelAlign: 'right',
items: [cmbUsernameFormats]
title: _('ID_PM_ENV_SETTINGS_USERFIELDSET_TITLE'),
labelAlign: 'right',
items: [cmbUsernameFormats]
});
fsDates = new Ext.form.FieldSet({
title: _('ID_PM_ENV_SETTINGS_REGIONFIELDSET_TITLE'),
labelAlign: 'right',
items: [cmbDateFormats]
title: _('ID_PM_ENV_SETTINGS_REGIONFIELDSET_TITLE'),
labelAlign: 'right',
items: [cmbDateFormats]
});
fsCases = new Ext.form.FieldSet({
title: _('ID_PM_ENV_SETTINGS_CASESLIST_TITLE'),
labelAlign: 'right',
items: [cmbCasesDateFormats,cmbCasesRowsPerPage]
title: _('ID_HOME_SETTINGS'),//_('ID_PM_ENV_SETTINGS_CASESLIST_TITLE'),
labelAlign: 'right',
items: [
new Ext.form.FieldSet({
title: _('ID_NEW_CASE_PANEL'),
labelAlign: 'right',
items: [
{
xtype: 'checkbox',
checked: FORMATS.startCaseHideProcessInf,
name: 'hideProcessInf',
fieldLabel: _('ID_HIDE_PROCESS_INF'),
listeners:{
check:function(){
saveButton.enable();
}
}
}
]
}),
new Ext.form.FieldSet({
title: _('ID_CASES_LIST_SETUP'),
labelAlign: 'right',
items: [cmbCasesDateFormats,cmbCasesRowsPerPage]
})
]
});
saveButton = new Ext.Action({
@@ -230,21 +244,21 @@ Ext.onReady(function() {
waitMsg : _('ID_SAVING_ENVIRONMENT_SETTINGS')+'...',
timeout : 36000,
success : function(res, req) {
PMExt.notify(_('ID_PM_ENV_SETTINGS_TITLE'), req.result.msg);
saveButton.disable();
PMExt.notify(_('ID_PM_ENV_SETTINGS_TITLE'), req.result.msg);
saveButton.disable();
}
});
}
});
formSettings = new Ext.FormPanel( {
region: 'center',
region: 'center',
labelWidth : 170, // label settings here cascade unless overridden
//labelAlign: 'right',
frame : true,
title : _('ID_PM_ENV_SETTINGS_TITLE'),
//bodyStyle : 'padding:5px 5px 0',
autoWidth : true,
width : 800,
autoScroll: true,
items : [fsSample,fsNames,fsDates, fsCases],
@@ -253,21 +267,23 @@ Ext.onReady(function() {
LoadSamples();
viewport = new Ext.Viewport({
layout: 'fit',
autoScroll: false,
items: [
formSettings
]
});
/*viewport = new Ext.Viewport({
layout: 'fit',
autoScroll: false,
items: [
formSettings
]
});*/
formSettings.render(document.body);
});
//Load Samples Label
LoadSamples = function(){
Ext.getCmp('lblFullName').setText(_FNF(_userName,_firstName,_lastName));
Ext.getCmp('lblDateFormat').setText(_DF(_dateSample));
Ext.getCmp('lblCasesDateFormat').setText(_DF(_dateSample,FORMATS.CasesListDateFormat));
Ext.getCmp('lblCasesRowsList').setText(FORMATS.CasesListRowNumber);
Ext.getCmp('lblFullName').setText(_FNF(_userName, _firstName, _lastName, FORMATS.format));
Ext.getCmp('lblDateFormat').setText(_DF(_dateSample, FORMATS.format));
Ext.getCmp('lblCasesDateFormat').setText(_DF(_dateSample, FORMATS.casesListDateFormat, FORMATS.casesListDateFormat));
Ext.getCmp('lblCasesRowsList').setText(FORMATS.casesListRowNumber);
};
//Change Some Setting
@@ -275,20 +291,20 @@ ChangeSettings = function(iType){
saveButton.enable();
switch (iType){
case '1':
_format = cmbUsernameFormats.getValue();
Ext.getCmp('lblFullName').setText(_FNF(_userName,_firstName,_lastName, _format));
break;
_format = cmbUsernameFormats.getValue();
Ext.getCmp('lblFullName').setText(_FNF(_userName,_firstName,_lastName, _format));
break;
case '2':
_format = cmbDateFormats.getValue();
Ext.getCmp('lblDateFormat').setText(_DF(_dateSample,_format));
break;
_format = cmbDateFormats.getValue();
Ext.getCmp('lblDateFormat').setText(_DF(_dateSample,_format));
break;
case '3':
_format = cmbCasesDateFormats.getValue();
Ext.getCmp('lblCasesDateFormat').setText(_DF(_dateSample,_format));
break;
_format = cmbCasesDateFormats.getValue();
Ext.getCmp('lblCasesDateFormat').setText(_DF(_dateSample,_format));
break;
case '4':
_format = cmbCasesRowsPerPage.getValue();
Ext.getCmp('lblCasesRowsList').setText(_format);
break;
_format = cmbCasesRowsPerPage.getValue();
Ext.getCmp('lblCasesRowsList').setText(_format);
break;
}
};

2
workflow/engine/templates/setup/loginSettings.js
View File

@@ -47,7 +47,7 @@ Ext.onReady(function(){
check:function(){ChangeSettings('2');}
}
},
}
],
buttons : [saveButton]
});