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

BUG 0000 BUG 0000 User Inbox Simplified (third commit)

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2012-01-31 18:45:30 -04:00
parent 6bc409131d
commit 8c91f1c057
16 changed files with 205 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/controllers/admin.php
View File

@@ -11,18 +11,17 @@ class Admin extends Controller
public function uxList()
{
require_once PATH_CONTROLLERS . 'adminProxy.php';
$this->includeExtJS('admin/uxUsersList');
//$this->setView('admin/calendarEdit');
//$this->setJSVar('fields',$fields);ç
G::LoadClass('configuration');
$c = new Configurations();
$configPage = $c->getConfiguration('usersList', 'pageSize','',$_SESSION['USER_LOGGED']);
$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
$this->setJSVar('CONFIG', $Config);
$this->setJSVar('FORMATS',$c->getFormats());
$this->setJSVar('CONFIG', $Config);
$this->setJSVar('FORMATS', $c->getFormats());
$this->setJSVar('uxTypes', AdminProxy::getUxTypesList('list'));
G::RenderPage('publish', 'extJs');
}

24
workflow/engine/controllers/adminProxy.php
View File

@@ -61,12 +61,26 @@ class adminProxy extends HttpProxyController
return array('success' => true, 'message'=>'done', 'groups'=>$row);
}
function getUxTypesList()
function getUxTypesList($type = 'assoc')
{
return Array(
'NORMAL' => 'Normal',
'SIMPLIFIED' => 'Simplified'
);
$list = array();
if ($type == 'assoc') {
$list = array(
'NORMAL' => 'Normal',
'SIMPLIFIED' => 'Simplified',
'SWITCHABLE' => 'Switchable'
);
}
else {
$list = array(
array('NORMAL', 'Normal'),
array('SIMPLIFIED', 'Simplified'),
array('SWITCHABLE', 'Switchable')
);
}
return $list;
}
function calendarSave()

11
workflow/engine/controllers/home.php
View File

@@ -13,17 +13,23 @@ class Home extends Controller
private $userName;
private $userFullName;
private $userRolName;
private $userUxType;
public function __construct()
{
$_SESSION['user_experience'] = 'simplified';
// setting as using simplified.
$_SESSION['current_ux'] = 'SIMPLIFIED';
// getting the ux type from user o group conf.
$this->userUxType = isset($_SESSION['user_experience'])? $_SESSION['user_experience']: $_SESSION['current_ux'];
if (isset($_SESSION['USER_LOGGED']) && !empty($_SESSION['USER_LOGGED'])) {
$this->userID = isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : null;
$this->userName = isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '';
$this->userFullName = isset($_SESSION['USR_FULLNAME']) ? $_SESSION['USR_FULLNAME'] : '';
$this->userRolName = isset($_SESSION['USR_ROLENAME']) ? $_SESSION['USR_ROLENAME'] : '';
}
//g::pr($_SESSION); die;
}
/**
@@ -52,6 +58,7 @@ class Home extends Controller
$this->setVar('userName', $this->userName);
$this->setVar('processList', $processList);
$this->setVar('canStartCase', $case->canStartCase($_SESSION ['USER_LOGGED']));
$this->setVar('userUxType', $this->userUxType);
G::RenderPage('publish', 'mvc');
}