abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First pass at implementing a new lock tracking mechnism. Not complete, but the basics seem to work

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1038 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
Abijah
2014-03-03 03:25:29 +00:00
parent 8249ecc5cd
commit e08afdd8b1
9 changed files with 597 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
site/controllers/units_controller.php
View File

@@ -213,7 +213,7 @@ class UnitsController extends AppController {
/**************************************************************************
**************************************************************************
**************************************************************************
* action: lock/unlock
* action: lock/unlock/lien
* - Transitions the unit into / out of the LOCKED state
*/
@@ -221,8 +221,73 @@ class UnitsController extends AppController {
$this->Unit->updateStatus($id, $status, true);
$this->redirect(array('action' => 'view', $id));
}
function lock($id) { $this->status($id, 'LOCKED'); }
function unlock($id) { $this->status($id, 'OCCUPIED'); }
function lock($id) {
if (isset($this->data)) {
$id = $this->id = $this->data['Unit']['id'];
// Check to see if the operation was cancelled.
if (isset($this->params['form']['cancel'])) {
if (isset($id))
$this->redirect(array('action'=>'view', $id));
$this->redirect(array('action'=>'index'));
}
// Figure out which locks the user put on
$locks = array();
if (isset($this->data['Lock']) && is_array($this->data['Lock'])) {
foreach ($this->data['Lock'] AS $lock) {
$locks[] = $lock['id'];
}
}
// Save the lock and all associated data
if (!$this->Unit->lockUnit($id, $locks)) {
$this->Session->setFlash("UNIT LOCK FAILED", true);
pr("UNIT LOCK FAILED");
}
// If it's no longer locked, change status to OCCUPIED
// Could still be liened... but that would be odd.
if (count($locks) == 0)
$this->status($id, 'OCCUPIED');
// If we're not liened, we must now just be locked
if (!$this->Unit->liened($id))
$this->status($id, 'LOCKED');
// Otherwise, don't change anything.
$this->redirect(array('action' => 'view', $id));
}
if (!$id)
$this->INTERNAL_ERROR("$id cannot be NULL");
// Get all locks on this unit
$this->data = $this->Unit->find
('first',
array('contain' => array('Lock' => array('id')),
'fields' => array('id'),
'conditions' => array('Unit.id' => $id)
));
$locks = $this->Unit->Lock->lockList();
/* $locksold = $locks; */
/* foreach ($locksold AS $name) { */
/* $locks[$name] = $name; */
/* } */
$this->set(compact('locks'));
// Prepare to render.
//pr($this->data);
$this->set(compact('title'));
// $this->render('lock');
}
function unlock($id) { $this->lock($id); }
function lien($id) { $this->status($id, 'LIENED'); }
/**************************************************************************
@@ -339,15 +404,20 @@ class UnitsController extends AppController {
if ($this->Unit->occupied($unit['Unit']['status']) &&
!$this->Unit->locked($unit['Unit']['status']))
$this->addSideMenuLink('Lock',
array('action' => 'Lock', $id), null,
array('action' => 'lock', $id), null,
'ACTION');
// If the unit is locked, provide an option to unlock it,
// unless it's locked due to lien, which is not so simple.
if ($this->Unit->locked($unit['Unit']['status']))
$this->addSideMenuLink('Relock/Unlock',
array('action' => 'lock', $id), null,
'ACTION');
// If the unit is locked, but not liened, give option to lien.
if ($this->Unit->locked($unit['Unit']['status']) &&
!$this->Unit->liened($unit['Unit']['status']))
$this->addSideMenuLink('Unlock',
array('action' => 'unlock', $id), null,
$this->addSideMenuLink('Lien',
array('action' => 'lien', $id), null,
'ACTION');
// If there is a current lease on this unit, then provide