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

Progress 17 for the dashboards

Browse Source
This commit is contained in:
Julio Cesar Laura
2011-10-31 22:11:03 -04:00
parent 0300489fef
commit a9ab4cb11c
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.pmDashlet.php
View File

@@ -133,6 +133,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
$criteria = new Criteria('workflow'); $criteria = new Criteria('workflow');
$criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID); $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID);
$criteria->addSelectColumn(DashletPeer::DAS_TITLE); $criteria->addSelectColumn(DashletPeer::DAS_TITLE);
$criteria->addSelectColumn(DashletInstancePeer::DAS_INS_CONTEXT_TIME);
$criteria->add(DashletInstancePeer::DAS_INS_OWNER_TYPE, 'DEPARTMENT'); $criteria->add(DashletInstancePeer::DAS_INS_OWNER_TYPE, 'DEPARTMENT');
$criteria->add(DashletInstancePeer::DAS_INS_OWNER_UID, $depUid); $criteria->add(DashletInstancePeer::DAS_INS_OWNER_UID, $depUid);
$dataset = DashletInstancePeer::doSelectRS($criteria); $dataset = DashletInstancePeer::doSelectRS($criteria);
@@ -140,6 +141,7 @@ class PMDashlet extends DashletInstance implements DashletInterface {
$dataset->next(); $dataset->next();
while ($row = $dataset->getRow()) { while ($row = $dataset->getRow()) {
if (!isset($dashletsInstances[$row['DAS_INS_UID']])) { if (!isset($dashletsInstances[$row['DAS_INS_UID']])) {
$row['DAS_TITLE'] .= ' (' . $row['DAS_INS_CONTEXT_TIME'] . ')';
$dashletsInstances[$row['DAS_INS_UID']] = $row; $dashletsInstances[$row['DAS_INS_UID']] = $row;
} }
$dataset->next(); $dataset->next();

3
workflow/engine/classes/model/DashletInstance.php
View File

@@ -34,6 +34,9 @@ class DashletInstance extends BaseDashletInstance {
$connection = Propel::getConnection(DashletInstancePeer::DATABASE_NAME); $connection = Propel::getConnection(DashletInstancePeer::DATABASE_NAME);
try { try {
if (!isset($data['DAS_INS_UID'])) { if (!isset($data['DAS_INS_UID'])) {
$data['DAS_INS_UID'] = '';
}
if ($data['DAS_INS_UID'] == '') {
$data['DAS_INS_UID'] = G::generateUniqueID(); $data['DAS_INS_UID'] = G::generateUniqueID();
$data['DAS_INS_CREATE_DATE'] = date('Y-m-d H:i:s'); $data['DAS_INS_CREATE_DATE'] = date('Y-m-d H:i:s');
$dashletInstance = new DashletInstance(); $dashletInstance = new DashletInstance();

10
workflow/engine/templates/dashboard/dashletsList.js
View File

@@ -197,7 +197,7 @@ Ext.onReady(function(){
editable: false, editable: false,
listeners:{ listeners:{
select: function(c,d,i){ select: function(c,d,i){
UpdatePageConfig(d.data['size']); //UpdatePageConfig(d.data['size']);
bbarpaging.pageSize = parseInt(d.data['size']); bbarpaging.pageSize = parseInt(d.data['size']);
bbarpaging.moveFirst(); bbarpaging.moveFirst();
} }
@@ -300,6 +300,14 @@ gridByDefault = function(){
infoGrid.store.load({params: {textFilter: searchText.getValue()}}); infoGrid.store.load({params: {textFilter: searchText.getValue()}});
};*/ };*/
//Update Page Size Configuration
/*updatePageConfig = function(pageSize) {
Ext.Ajax.request({
url: 'updatePageConfig',
params: {size: pageSize}
});
};*/
//New Dashlet Instance Action //New Dashlet Instance Action
newDashletInstance = function() { newDashletInstance = function() {
location.href = 'dashletInstanceForm'; location.href = 'dashletInstanceForm';