Merge in from the pre_0.1 branch
git-svn-id: file:///svn-source/pmgr/branches/sandbox_0.1@794 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -38,7 +38,7 @@ class AppController extends Controller {
|
||||
var $helpers = array('Html', 'Form', 'Javascript', 'Format', 'Time', 'Grid');
|
||||
var $components = array('DebugKit.Toolbar');
|
||||
|
||||
var $sidemenu_areas = array('SITE' => false, 'CONTROLLER' => false, 'ACTION' => false);
|
||||
var $sidemenu = array('areas' => array('SITE' => false, 'CONTROLLER' => false, 'ACTION' => false));
|
||||
var $std_area = 10;
|
||||
var $new_area = 20;
|
||||
var $op_area = 30;
|
||||
@@ -61,7 +61,7 @@ class AppController extends Controller {
|
||||
|
||||
function sideMenuAreaVerify(&$area, $subarea, $priority = null) {
|
||||
$area = strtoupper($area);
|
||||
if (!array_key_exists($area, $this->sidemenu_areas))
|
||||
if (!array_key_exists($area, $this->sidemenu['areas']))
|
||||
$this->INTERNAL_ERROR("Sidemenu link '{$area}': Unknown");
|
||||
|
||||
if ($area == 'SITE')
|
||||
@@ -71,9 +71,9 @@ class AppController extends Controller {
|
||||
elseif ($area == 'ACTION')
|
||||
$name = Inflector::humanize(Inflector::singularize($this->params['controller']));
|
||||
|
||||
if (empty($this->sidemenu_areas[$area]))
|
||||
$this->sidemenu_areas[$area]
|
||||
= array('enable' => true, 'name' => $name, 'subarea' => array());
|
||||
if (empty($this->sidemenu['areas'][$area]))
|
||||
$this->sidemenu['areas'][$area]
|
||||
= array('enable' => true, 'name' => $name, 'subareas' => array());
|
||||
|
||||
if (empty($subarea))
|
||||
return;
|
||||
@@ -83,7 +83,7 @@ class AppController extends Controller {
|
||||
$subname .= '';
|
||||
elseif ($subarea == $this->op_area)
|
||||
//$subname .= '-Ops';
|
||||
$subname = 'Operations';
|
||||
$subname = 'Actions';
|
||||
elseif ($subarea == $this->new_area)
|
||||
//$subname .= '-New';
|
||||
$subname = 'Creation';
|
||||
@@ -94,15 +94,15 @@ class AppController extends Controller {
|
||||
else
|
||||
$subname .= '-' . $subarea;
|
||||
|
||||
if (empty($this->sidemenu_areas[$area]['subarea'][$subarea]))
|
||||
$this->sidemenu_areas[$area]['subarea'][$subarea]
|
||||
if (empty($this->sidemenu['areas'][$area]['subareas'][$subarea]))
|
||||
$this->sidemenu['areas'][$area]['subareas'][$subarea]
|
||||
= array('enable' => true, 'name' => $subname, 'priorities' => array());
|
||||
|
||||
if (empty($priority))
|
||||
return;
|
||||
|
||||
if (empty($this->sidemenu_areas[$area]['subarea'][$subarea]['priorities'][$priority]))
|
||||
$this->sidemenu_areas[$area]['subarea'][$subarea]['priorities'][$priority]
|
||||
if (empty($this->sidemenu['areas'][$area]['subareas'][$subarea]['priorities'][$priority]))
|
||||
$this->sidemenu['areas'][$area]['subareas'][$subarea]['priorities'][$priority]
|
||||
= array();
|
||||
}
|
||||
|
||||
@@ -117,9 +117,22 @@ class AppController extends Controller {
|
||||
function sideMenuAreaName($name, $area, $subarea = null) {
|
||||
$this->sideMenuAreaVerify($area, $subarea);
|
||||
if (empty($subarea))
|
||||
$this->sidemenu_areas[$area]['name'] = $name;
|
||||
$this->sidemenu['areas'][$area]['name'] = $name;
|
||||
else
|
||||
$this->sidemenu_areas[$area]['subarea'][$subarea]['name'] = $name;
|
||||
$this->sidemenu['areas'][$area]['subareas'][$subarea]['name'] = $name;
|
||||
}
|
||||
|
||||
|
||||
/**************************************************************************
|
||||
**************************************************************************
|
||||
**************************************************************************
|
||||
* function: sideMenuAreaActivate
|
||||
* - Sets the selected area/subarea to be active when the
|
||||
* page is first loaded.
|
||||
*/
|
||||
|
||||
function sideMenuAreaActivate($area, $subarea = null) {
|
||||
$this->sidemenu['active'] = compact('area', 'subarea');
|
||||
}
|
||||
|
||||
|
||||
@@ -133,9 +146,9 @@ class AppController extends Controller {
|
||||
function sideMenuEnable($area, $subarea = null, $enable = true) {
|
||||
$this->sideMenuAreaVerify($area, $subarea);
|
||||
if (isset($subarea))
|
||||
$this->sidemenu_areas[$area]['subarea'][$subarea]['enable'] = $enable;
|
||||
$this->sidemenu['areas'][$area]['subareas'][$subarea]['enable'] = $enable;
|
||||
else
|
||||
$this->sidemenu_areas[$area]['enable'] = $enable;
|
||||
$this->sidemenu['areas'][$area]['enable'] = $enable;
|
||||
}
|
||||
|
||||
|
||||
@@ -150,7 +163,7 @@ class AppController extends Controller {
|
||||
if (empty($subarea))
|
||||
$subarea = $this->std_area;
|
||||
$this->sideMenuAreaVerify($area, $subarea);
|
||||
$this->sidemenu_areas[$area]['subarea'][$subarea]['priorities'][$priority][]
|
||||
$this->sidemenu['areas'][$area]['subareas'][$subarea]['priorities'][$priority][]
|
||||
= array('name' => $name, 'url' => $url) + (empty($extra) ? array() : $extra);
|
||||
}
|
||||
|
||||
@@ -167,6 +180,9 @@ class AppController extends Controller {
|
||||
$this->addSideMenuLink('Site Map',
|
||||
array('controller' => 'maps', 'action' => 'view', 1), null,
|
||||
'SITE');
|
||||
$this->addSideMenuLink('Unit Sizes',
|
||||
array('controller' => 'unit_sizes', 'action' => 'index'), null,
|
||||
'SITE');
|
||||
$this->addSideMenuLink('Units',
|
||||
array('controller' => 'units', 'action' => 'index'), null,
|
||||
'SITE');
|
||||
@@ -179,72 +195,83 @@ class AppController extends Controller {
|
||||
$this->addSideMenuLink('Deposits',
|
||||
array('controller' => 'transactions', 'action' => 'deposit'), null,
|
||||
'SITE');
|
||||
|
||||
|
||||
$this->addSideMenuLink('Accounts',
|
||||
array('controller' => 'accounts', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Contacts',
|
||||
array('controller' => 'contacts', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Ledgers',
|
||||
array('controller' => 'ledgers', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Tenders',
|
||||
array('controller' => 'tenders', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Transactions',
|
||||
array('controller' => 'transactions', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Ldgr Entries',
|
||||
array('controller' => 'ledger_entries', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Stmt Entries',
|
||||
array('controller' => 'statement_entries', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Assess Charges',
|
||||
array('controller' => 'leases', 'action' => 'assess_all'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('RESET DATA',
|
||||
array('controller' => 'accounts', 'action' => 'reset_data'), null,
|
||||
'SITE');
|
||||
|
||||
/* $this->addSideMenuLink('Move-In', */
|
||||
/* array('controller' => 'customers', 'action' => 'move_in'), null, */
|
||||
/* 'SITE', $this->op_area); */
|
||||
|
||||
/* $this->addSideMenuLink('Move-Out', */
|
||||
/* array('controller' => 'customers', 'action' => 'move_out'), null, */
|
||||
/* 'SITE', $this->op_area); */
|
||||
|
||||
/* $this->addSideMenuLink('New Receipt', */
|
||||
/* array('controller' => 'customers', 'action' => 'receipt'), null, */
|
||||
/* 'SITE', $this->op_area); */
|
||||
|
||||
/* $this->addSideMenuLink('New Customer', */
|
||||
/* array('controller' => 'customers', 'action' => 'add'), null, */
|
||||
/* 'SITE', $this->op_area); */
|
||||
|
||||
/* $this->addSideMenuLink('New Deposit', */
|
||||
/* array('controller' => 'tenders', 'action' => 'deposit'), null, */
|
||||
/* 'SITE', $this->op_area); */
|
||||
|
||||
if ($this->params['admin']) {
|
||||
$this->addSideMenuLink('Accounts',
|
||||
array('controller' => 'accounts', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Contacts',
|
||||
array('controller' => 'contacts', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Ledgers',
|
||||
array('controller' => 'ledgers', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Tenders',
|
||||
array('controller' => 'tenders', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Transactions',
|
||||
array('controller' => 'transactions', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Ldgr Entries',
|
||||
array('controller' => 'ledger_entries', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Stmt Entries',
|
||||
array('controller' => 'statement_entries', 'action' => 'index'), null,
|
||||
'SITE', $this->admin_area);
|
||||
$this->addSideMenuLink('Assess Charges',
|
||||
array('controller' => 'leases', 'action' => 'assess_all'), null,
|
||||
'SITE', $this->admin_area);
|
||||
}
|
||||
|
||||
if ($this->params['dev']) {
|
||||
$this->addSideMenuLink('Un-Nuke',
|
||||
'#', array('htmlAttributes' =>
|
||||
array('onclick' => '$(".pr-section").show(); return false;')),
|
||||
'SITE', $this->dev_area);
|
||||
$this->addSideMenuLink('New Ledgers',
|
||||
array('controller' => 'accounts', 'action' => 'newledger'), null,
|
||||
'SITE', $this->dev_area);
|
||||
}
|
||||
'SITE', $this->admin_area);
|
||||
|
||||
|
||||
$this->sideMenuAreaName('Operations', 'SITE', $this->op_area);
|
||||
$this->addSideMenuLink('Un-Nuke',
|
||||
'#', array('htmlAttributes' =>
|
||||
array('onclick' => '$(".pr-section").show(); return false;')),
|
||||
'SITE', $this->dev_area);
|
||||
$this->addSideMenuLink('New Ledgers',
|
||||
array('controller' => 'accounts', 'action' => 'newledger'), null,
|
||||
'SITE', $this->dev_area);
|
||||
|
||||
|
||||
$this->addSideMenuLink('New Receipt',
|
||||
array('controller' => 'customers', 'action' => 'receipt'), null,
|
||||
'SITE', $this->op_area);
|
||||
|
||||
$this->addSideMenuLink('New Invoice',
|
||||
array('controller' => 'leases', 'action' => 'invoice'), null,
|
||||
'SITE', $this->op_area);
|
||||
|
||||
$this->addSideMenuLink('Move-In',
|
||||
array('controller' => 'customers', 'action' => 'move_in'), null,
|
||||
'SITE', $this->op_area);
|
||||
|
||||
$this->addSideMenuLink('Move-Out',
|
||||
array('controller' => 'leases', 'action' => 'move_out'), null,
|
||||
'SITE', $this->op_area);
|
||||
|
||||
$this->addSideMenuLink('New Deposit',
|
||||
array('controller' => 'tenders', 'action' => 'deposit'), null,
|
||||
'SITE', $this->op_area);
|
||||
|
||||
// REVISIT <AP>: 20090824
|
||||
// Depending on preference, we may put this into the gridView
|
||||
// function, making the links available only when navigating.
|
||||
$this->addGridViewSideMenuLinks();
|
||||
}
|
||||
|
||||
|
||||
/**************************************************************************
|
||||
**************************************************************************
|
||||
**************************************************************************
|
||||
* virtual: addGridViewSideMenuLinks
|
||||
* - Adds the grid view specific navigation links, if overridden.
|
||||
*/
|
||||
|
||||
function addGridViewSideMenuLinks() {
|
||||
}
|
||||
|
||||
/**************************************************************************
|
||||
**************************************************************************
|
||||
**************************************************************************
|
||||
@@ -263,6 +290,13 @@ class AppController extends Controller {
|
||||
|
||||
$this->addDefaultSideMenuLinks();
|
||||
$this->sideMenuEnable('SITE', $this->op_area, false);
|
||||
|
||||
foreach ($this->sidemenu['areas'] AS $area_name => $area) {
|
||||
if (empty($this->params['dev']))
|
||||
$this->sideMenuEnable($area_name, $this->dev_area, false);
|
||||
if (empty($this->params['admin']))
|
||||
$this->sideMenuEnable($area_name, $this->admin_area, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -282,24 +316,48 @@ class AppController extends Controller {
|
||||
$this->params['admin'] = false;
|
||||
}
|
||||
|
||||
foreach ($this->sidemenu_areas AS &$area) {
|
||||
foreach ($this->sidemenu['areas'] AS $aname => &$area) {
|
||||
if (empty($area['enable']))
|
||||
$area = array();
|
||||
if (empty($area['subarea']))
|
||||
if (empty($area['subareas']))
|
||||
continue;
|
||||
ksort($area['subarea']);
|
||||
ksort($area['subareas']);
|
||||
|
||||
foreach ($area['subarea'] AS &$subarea) {
|
||||
foreach ($area['subareas'] AS $sname => &$subarea) {
|
||||
if (empty($subarea['enable']))
|
||||
$subarea = array();
|
||||
if (empty($subarea['priorities']))
|
||||
continue;
|
||||
ksort($subarea['priorities']);
|
||||
|
||||
foreach ($subarea['priorities'] AS $pname => &$priority) {
|
||||
if (empty($priority))
|
||||
unset($subarea['priorities'][$pname]);
|
||||
}
|
||||
unset($priority);
|
||||
|
||||
if (empty($subarea['priorities']))
|
||||
unset($area['subareas'][$sname]);
|
||||
}
|
||||
unset($subarea);
|
||||
|
||||
if (empty($area['subareas']))
|
||||
unset($this->sidemenu['areas'][$aname]);
|
||||
}
|
||||
unset($area);
|
||||
|
||||
// Activate a default section (unless already specified)
|
||||
foreach (array_reverse($this->sidemenu['areas']) AS $area_name => $area) {
|
||||
if (empty($area))
|
||||
continue;
|
||||
|
||||
if (empty($this->sidemenu['active']) ||
|
||||
empty($this->sidemenu['areas'][$this->sidemenu['active']['area']]))
|
||||
$this->sideMenuAreaActivate($area_name);
|
||||
}
|
||||
|
||||
//pr($this->sidemenu_areas);
|
||||
$this->set('sidemenu', $this->sidemenu_areas);
|
||||
//pr($this->sidemenu);
|
||||
$this->set('sidemenu', $this->sidemenu);
|
||||
}
|
||||
|
||||
|
||||
@@ -373,9 +431,14 @@ class AppController extends Controller {
|
||||
* helper: gridView
|
||||
* - called by derived controllers to create an index listing
|
||||
*/
|
||||
function index() {
|
||||
$names = Inflector::humanize(Inflector::pluralize($this->params['controller']));
|
||||
$this->gridView('All ' . $names, 'all');
|
||||
}
|
||||
|
||||
function gridView($title, $action = null, $element = null) {
|
||||
$this->sideMenuEnable('SITE', $this->op_area);
|
||||
$this->sideMenuAreaActivate('CONTROLLER');
|
||||
$this->set('title', $title);
|
||||
// The resulting page will contain a grid, which will
|
||||
// use ajax to obtain the actual data for this action
|
||||
@@ -512,6 +575,7 @@ class AppController extends Controller {
|
||||
$xml = preg_replace("/</", "<", $xml);
|
||||
$xml = preg_replace("/>/", ">", $xml);
|
||||
echo ("\n<PRE>\n$xml\n</PRE>\n");
|
||||
$this->render_empty();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1020,10 +1084,9 @@ class AppController extends Controller {
|
||||
}
|
||||
|
||||
function gridDataOutputHeader(&$params, &$model) {
|
||||
if (!$params['debug']) {
|
||||
if (!$params['debug'])
|
||||
header("Content-type: text/xml;charset=utf-8");
|
||||
}
|
||||
}
|
||||
|
||||
function gridDataOutputXMLHeader(&$params, &$model) {
|
||||
echo "<?xml version='1.0' encoding='utf-8'?>\n";
|
||||
|
||||
Reference in New Issue
Block a user