fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 6087 added filter of dates for translation labels

Browse Source
This commit is contained in:
Alvaro Campos
2011-04-13 12:47:50 -04:00
parent 7283c31e06
commit 721a87f6c0
3 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/classes/model/Translation.php
View File

@@ -62,7 +62,7 @@ class Translation extends BaseTranslation {
return $oCriteria;
}
function getAll($lang='en', $start=null, $limit=null, $search=null){
function getAll($lang='en', $start=null, $limit=null, $search=null, $dateFrom=null, $dateTo=null){
$totalCount = 0;
$oCriteria = new Criteria('workflow');
@@ -88,7 +88,19 @@ class Translation extends BaseTranslation {
))
);
}
// for date filter
if( ($dateFrom)&&($dateTo) ) {
$oCriteria->add(
$oCriteria->getNewCriterion(
TranslationPeer::TRN_UPDATE_DATE,
"$dateFrom", Criteria::GREATER_EQUAL//LESS_EQUAL
)->addAnd($oCriteria->getNewCriterion(
TranslationPeer::TRN_UPDATE_DATE,
"$dateTo", Criteria::LESS_EQUAL//GREATER_EQUAL
))
);
}
// end filter
$c = clone $oCriteria;
$c->clearSelectColumns();
$c->addSelectColumn('COUNT(*)');

8
workflow/engine/methods/tools/ajaxListener.php
View File

@@ -38,10 +38,12 @@ $ajax->$action($_REQUEST);
class Ajax
{
function getList($params)
{
{
$search = isset($params['search']) ? $params['search'] : null;
$result = Translation::getAll('en', $params['start'], $params['limit'], $search);
$params['dateFrom'] = str_replace('T00:00:00','',$params['dateFrom']);
$params['dateTo'] = str_replace('T00:00:00','',$params['dateTo']);
$result = Translation::getAll('en', $params['start'], $params['limit'], $search, $params['dateFrom'], $params['dateTo']);
//$result = Translation::getAll('en', $params['start'], $params['limit'], $search);
/*foreach($result->data as $i=>$row){
$result->data[$i]['TRN_VALUE'] = substr($row['TRN_VALUE'], 0, 15) . '...';

45
workflow/engine/templates/tools/main.js
View File

@@ -90,7 +90,7 @@ Ext.onReady(function(){
Ext.getCmp('label').setValue('');
newLabelWin.show();
}
},{
},{
text:_('ID_REMOVE'),
iconCls: 'button_menu_ext ss_sprite ss_delete',
handler: removeLabel
@@ -98,7 +98,30 @@ Ext.onReady(function(){
text: ' Rebuild',
icon: '/images/trigger.gif',
handler: rebuild
},'->',
},
//{
// text: ' Export',
// icon: '/images/export.png',
// handler: rebuild
// },
' ',' ',' ',' '
, 'From',
dateFrom,
' ',
' To ',//TRANSLATIONS.ID_TO,
dateTo,
new Ext.Button ({
text: TRANSLATIONS.ID_FILTER_BY_DELEGATED_DATE,
handler: function(){
store.setBaseParam('dateFrom', dateFrom.getValue());
store.setBaseParam('dateTo', dateTo.getValue());
store.load({params:{start : 0 , limit : 20}});
//store.load({params:{ start : 0 , limit : pageSize }});
}
})
,'->',
new Ext.form.TextField ({
id: 'searchTxt',
ctCls:'pm_search_text_field',
@@ -148,8 +171,7 @@ Ext.onReady(function(){
single: true
});
centerPanel = new Ext.Panel({
layout: 'fit',
region: 'center', // a center region is ALWAYS required for border layout
@@ -213,6 +235,21 @@ var edit = function(){
}
});
}
//
var dateFrom = new Ext.form.DateField({
id:'dateFrom',
format: 'Y-m-d',
width: 120,
value: ''
});
var dateTo = new Ext.form.DateField({
id:'dateTo',
format: 'Y-m-d',
width: 120,
value: ''
});
//
var frm = new Ext.FormPanel( {
id: 'formNew',