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

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
jennylee
2013-10-10 11:08:51 -04:00
parent 01f27366c8 3eef6ff958
commit 1ed9f7e6f1
10 changed files with 96 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/classes/class.AppSolr.php
View File

@@ -351,6 +351,11 @@ class AppSolr
//$sortableCols [0] = 'true';
$sortDir [0] = $dir;
break;
case 'APP_STATUS' :
$sortCols [0] = 'APP_STATUS'; //6;
//$sortableCols [0] = 'true';
$sortDir [0] = $dir;
break;
case 'APP_UPDATE_DATE' :
$sortCols [0] = 'DEL_LAST_UPDATE_DATE'; //12;
//$sortableCols [0] = 'true';
@@ -1991,12 +1996,14 @@ class AppSolr
$value = intval ($value);
}
else {
$typeSufix = '_ti';
$typeSufix = '_ti';
$value = str_replace( ',', '', $value );
$value = intval ($value);
}
break;
case 'Real' :
$typeSufix = '_td';
$value = str_replace( ',', '', $value );
$value = floatval ($value);
break;
case 'date' :

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

@@ -558,7 +558,7 @@ class Configurations // extends Configuration
list ($y, $m, $d) = explode('-', $date);
list ($h, $i, $s) = explode(':', $time);
$newCreation = '';
$maskTime = array('d' => '%d', 'D' => '%A', 'j' => '%e', 'l' => '%A', 'G' => '%I', 'g' => '%i', 'N' => '%u', 'S' => '%d', 'w' => '%w', 'z' => '%j', 'W' => '%W', 'F' => '%B', 'm' => '%m', 'M' => '%B', 'n' => '%m', 'o' => '%Y', 'Y' => '%Y', 'y' => '%g', 'a' => '%p', 'A' => '%p', 'g' => '%l', 'G' => '%k', 'h' => '%I', 'H' => '%H', 'i' => '%M', 's' => '%S');
$maskTime = array('d' => '%d', 'D' => '%A', 'j' => '%d', 'l' => '%A', 'G' => '%I', 'g' => '%i', 'N' => '%u', 'S' => '%d', 'w' => '%w', 'z' => '%j', 'W' => '%W', 'F' => '%B', 'm' => '%m', 'M' => '%B', 'n' => '%m', 'o' => '%Y', 'Y' => '%Y', 'y' => '%g', 'a' => '%p', 'A' => '%p', 'g' => '%I', 'G' => '%H', 'h' => '%I', 'H' => '%H', 'i' => '%M', 's' => '%S');
$creationDateMask = trim($creationDateMask);
if (strpos($creationDateMask, ' \\d\\e ') !== false) {
@@ -965,7 +965,7 @@ class Configurations // extends Configuration
break;
}
return array("caseColumns" => $caseColumns, "caseReaderFields" => $caseReaderFields, "rowsperpage" => 20, "dateformat" => "M d, Y");
return array("caseColumns" => $caseColumns, "caseReaderFields" => $caseReaderFields, "rowsperpage" => 25, "dateformat" => "M d, Y");
}
/**
* Set the current Directory structure version, default value 1.

4
workflow/engine/classes/class.pmScript.php Executable file → Normal file
View File

@@ -575,7 +575,7 @@ function handleFatalErrors ($buffer)
if (preg_match( '/(error<\/b>:)(.+)(<br)/', $buffer, $regs )) {
$err = preg_replace( '/<.*?>/', '', $regs[2] );
$aAux = explode( ' in ', $err );
$sCode = $_SESSION['_CODE_'];
$sCode = isset($_SESSION['_CODE_']) ? $_SESSION['_CODE_'] : null;
unset( $_SESSION['_CODE_'] );
registerError( 2, $aAux[0], 0, $sCode );
if (strpos( $_SERVER['REQUEST_URI'], '/cases/cases_Step' ) !== false) {
@@ -604,7 +604,7 @@ function handleFatalErrors ($buffer)
die();
} else {
$aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
if ($_SESSION['TRIGGER_DEBUG']['ISSET']) {
if (isset($_SESSION['TRIGGER_DEBUG']['ISSET']) && $_SESSION['TRIGGER_DEBUG']['ISSET']) {
$_SESSION['TRIGGER_DEBUG']['TIME'] = 'AFTER';
$_SESSION['TRIGGER_DEBUG']['BREAKPAGE'] = $aNextStep['PAGE'];
$aNextStep['PAGE'] = $aNextStep['PAGE'] . '&breakpoint=triggerdebug';

2
workflow/engine/methods/cases/cases_SaveData.php Executable file → Normal file
View File

@@ -56,7 +56,7 @@ try {
$Fields["APP_DATA"] = array_merge( $Fields["APP_DATA"], $_POST["form"] );
#here we must verify if is a debug session
$trigger_debug_session = $_SESSION['TRIGGER_DEBUG']['ISSET']; #here we must verify if is a debugg session
$trigger_debug_session = isset($_SESSION['TRIGGER_DEBUG']['ISSET']) ? $_SESSION['TRIGGER_DEBUG']['ISSET'] : null; #here we must verify if is a debugg session
#trigger debug routines...

7
workflow/engine/methods/users/users_Ajax.php Executable file → Normal file
View File

@@ -435,9 +435,14 @@ try {
$oRoles = new Roles();
$rows = Array();
$uRole = Array();
while ($oDataset->next()) {
$row = $oDataset->getRow();
$uRole = $oRoles->loadByCode($row['USR_ROLE']);
try {
$uRole = $oRoles->loadByCode($row['USR_ROLE']);
} catch (exception $oError) {
$uRole['ROL_NAME'] = G::loadTranslation( 'ID_DELETED' );
}
$row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE'];
$row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1;
$row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? $aLogin[$row['USR_UID']] : '';

10
workflow/engine/skinEngine/simplified/templates/applications.html
View File

@@ -3,15 +3,15 @@
<span class="commentnumber">
#{$APP.APP_NUMBER}
</span>
<span id="n_{$APP.APP_UID}" class="notes-link" style="display:{if $APP.NOTES_COUNT neq 0}block{else}none{/if}">
<a href="#" onclick="showNt('{$APP.APP_UID}'); return false;"><img src="/images/simplified/messages-grey.png" height="20" width="20" border="0"></a>
</span>
<span class="notes-plus-link">
<a href="#" onclick="addNt('{$APP.APP_UID}', '{$APP.PRO_UID}', '{$APP.TAS_UID}'); return false;"><img src="/images/simplified/messages-grey-plus.png" height="21" width="21" border="0"></a>
</span>
<p>
<cite>
<a href="../cases/cases_Open?APP_UID={$APP.APP_UID}&DEL_INDEX={$APP.DEL_INDEX}&action=todo">{$APP.APP_TITLE}</a>
@@ -19,13 +19,13 @@
</p>
<p class="time">
{if $APP.APP_DEL_PREVIOUS_USER != ''}
From {$APP.APP_DEL_PREVIOUS_USER}, send at
{translate label="ID_FROM"} {$APP.APP_DEL_PREVIOUS_USER}, {translate label="ID_SEND_AT"}
{/if}
{$APP.DEL_DELEGATE_DATE}
</p>
<p>{$APP.APP_PRO_TITLE}
<br/>{$APP.APP_TAS_TITLE}</p>
<div id="m_{$APP.APP_UID}" class="appMessages">
{if $APP.NOTES_COUNT neq 0}
{foreach from=$APP.NOTES_LIST key=k item=NOTE}

2
workflow/engine/templates/home/appList.html
View File

@@ -152,7 +152,7 @@
$('#loadmorebutton').html( {/literal}"{translate label="ID_LOAD_MORE"}"{literal} );
}
else {
$('#loadmorebutton').replaceWith(<center>{/literal}"{translate label="ID_NO_MORE_APPLICATIONS"}"{literal}</center>);
$('#loadmorebutton').replaceWith({/literal}"{translate label="ID_NO_MORE_APPLICATIONS"}"{literal});
}
}
});

2
workflow/engine/templates/home/applications.html
View File

@@ -19,7 +19,7 @@
</p>
<p class="time">
{if $APP.APP_DEL_PREVIOUS_USER != ''}
From {$APP.APP_DEL_PREVIOUS_USER}, send at
{translate label="ID_FROM"} {$APP.APP_DEL_PREVIOUS_USER}, {translate label="ID_SEND_AT"}
{/if}
{$APP.DEL_DELEGATE_DATE}
</p>

36
workflow/engine/templates/pmTables/data.js
View File

@@ -196,9 +196,39 @@ Ext.onReady(function(){
});
//row editor for table columns grid
var flagShowMessageError = 1;
if (!isReport) {
editor = new Ext.ux.grid.RowEditor({
editor = new Ext.ux.grid.RowEditor({
saveText : _("ID_UPDATE"),
isValid: function ()
{
var valid = true;
this.items.each(function(f) {
if(!f.isValid(true)){
valid = false;
if (valid) {
flagShowMessageError = 1;
}
return false;
}
});
if (valid) {
flagShowMessageError = 1;
}
return valid;
},
showTooltip: function (msg)
{
if (flagShowMessageError == 1) {
Ext.msgBoxSlider.msgTopCenter("error", _("ID_ERROR"), msg, 3);
flagShowMessageError = 0;
}
},
listeners : {
afteredit : {
fn:function(rowEditor, obj, data, rowIndex ){
@@ -206,6 +236,10 @@ Ext.onReady(function(){
//store.reload(); // only if it is an insert
}
}
},
canceledit: function (grid, obj)
{
flagShowMessageError = 1;
}
}
});

36
workflow/engine/templates/pmTables/edit.js Executable file → Normal file
View File

@@ -242,6 +242,8 @@ Ext.onReady(function(){
var sizeEdit = Ext.getCmp("sizeEdit");
editorFieldsEnableDisable(selCombo, fieldNull, fieldPrimaryKey, fieldInc, sizeEdit);
flagShowMessageError = 1;
}
}//select
}
@@ -339,13 +341,45 @@ Ext.onReady(function(){
]
});
//row editor for table columns grid
var flagShowMessageError = 1;
editor = new Ext.ux.grid.RowEditor({
saveText: _("ID_UPDATE"),
isValid: function ()
{
var valid = true;
this.items.each(function(f) {
if(!f.isValid(true)){
valid = false;
if (valid) {
flagShowMessageError = 1;
}
return false;
}
});
if (valid) {
flagShowMessageError = 1;
}
return valid;
},
showTooltip: function (msg)
{
if (flagShowMessageError == 1) {
Ext.msgBoxSlider.msgTopCenter("error", _("ID_ERROR"), msg, 3);
flagShowMessageError = 0;
}
},
listeners: {
canceledit: function(grid,obj){
if ( grid.record.data.field_label == '' && grid.record.data.field_name == '') {
store.remove(grid.record);
}
flagShowMessageError = 1;
}
}
});
@@ -716,7 +750,7 @@ Ext.onReady(function(){
if (dataNumRows > 0) {
var tpl = new Ext.Template(
'<div id="fb" style="border: 1px solid #FF0000; background-color:#FFAAAA; display:none; padding:15px; color:#000000; font-size:12px;">'+
'<b>Warning: </b> ' + dataNumRows + ' ' + _('ID_PMTABLE_DATA_EXISTS_WARNINIG') + ' <a href="#" id="hideWarning">[ '+_('ID_HIDE')+' ]</a></div>'
'<b>Warning: </b> ' + dataNumRows + ' ' + _('ID_PMTABLE_DATA_EXISTS_WARNINIG') + ' <a href="#" id="hideWarning" onclick="return false;">[ '+_('ID_HIDE')+' ]</a></div>'
);
var newEl = tpl.insertFirst(document.getElementById('assignedGrid'));