Added lock/unlock links directly on the unit page. Also, found the grid view links seem to be needed even when not already navigating a grid. Without them, the user must go first through the top level navigation link, then to the specific grid subset. It's a bit painful, and so I decided to add them back in. To facilitate this, instead of repeatedly changing each controller whenever we change our minds, I added a new virtual function to that app. I'll change the remaining controllers on the next checkin.

git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@776 97e9348a-65ac-dc4b-aefc-98561f571b83
2009-08-25 02:29:29 +00:00
parent f8cdea8872
commit b2a85a5197
3 changed files with 108 additions and 30 deletions
--- a/site/app_controller.php
+++ b/site/app_controller.php
@@ -250,9 +250,23 @@ class AppController extends Controller {
 			   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() {
+  }
+
  /**************************************************************************
   **************************************************************************
   **************************************************************************
--- a/site/controllers/units_controller.php
+++ b/site/controllers/units_controller.php
@@ -6,12 +6,31 @@ class UnitsController extends AppController {
  /**************************************************************************
   **************************************************************************
   **************************************************************************
-   * override: addDefaultSideMenuLinks
-   *  - Adds controller specific default side menu links
+   * override: addGridViewSideMenuLinks
+   *  - Adds grid view navigation side menu links
   */

-  function addDefaultSideMenuLinks() {
-    parent::addDefaultSideMenuLinks();
+  function addGridViewSideMenuLinks() {
+    parent::addGridViewSideMenuLinks();
+
+    $this->addSideMenuLink('Unavailable',
+			   array('controller' => 'units', 'action' => 'unavailable'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Vacant',
+			   array('controller' => 'units', 'action' => 'vacant'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Occupied',
+			   array('controller' => 'units', 'action' => 'occupied'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Overlocked',
+			   array('controller' => 'units', 'action' => 'locked'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('Liened',
+			   array('controller' => 'units', 'action' => 'liened'), null,
+			   'CONTROLLER');
+    $this->addSideMenuLink('All',
+			   array('controller' => 'units', 'action' => 'all'), null,
+			   'CONTROLLER');
  }


@@ -27,26 +46,9 @@ class UnitsController extends AppController {
  function vacant()      { $this->gridView('Vacant Units'); }
  function occupied()    { $this->gridView('Occupied Units'); }
  function locked()      { $this->gridView('Overlocked Units'); }
+  function liened()      { $this->gridView('Liened Units'); }
  function all()         { $this->gridView('All Units', 'all'); }

-  function gridView($title, $action = null, $element = null) {
-    $this->addSideMenuLink('Overlocked',
-			   array('controller' => 'units', 'action' => 'locked'), null,
-			   'CONTROLLER');
-    $this->addSideMenuLink('Occupied',
-			   array('controller' => 'units', 'action' => 'occupied'), null,
-			   'CONTROLLER');
-    $this->addSideMenuLink('Vacant',
-			   array('controller' => 'units', 'action' => 'vacant'), null,
-			   'CONTROLLER');
-    $this->addSideMenuLink('Unavailable',
-			   array('controller' => 'units', 'action' => 'unavailable'), null,
-			   'CONTROLLER');
-    $this->addSideMenuLink('All',
-			   array('controller' => 'units', 'action' => 'all'), null,
-			   'CONTROLLER');
-    parent::gridView($title, $action, $element);
-  }

  /**************************************************************************
   **************************************************************************
@@ -114,7 +116,10 @@ class UnitsController extends AppController {
      $conditions[] = array('NOT' => array($this->Unit->conditionOccupied()));
    }
    elseif ($params['action'] === 'locked') {
-      $conditions[] = array('Unit.status' => 'LOCKED');
+      $conditions[] = $this->Unit->conditionLocked();
+    }
+    elseif ($params['action'] === 'liened') {
+      $conditions[] = $this->Unit->conditionLiened();
    }

    return $conditions;
@@ -205,6 +210,21 @@ class UnitsController extends AppController {
  }


+  /**************************************************************************
+   **************************************************************************
+   **************************************************************************
+   * action: lock/unlock
+   *  - Transitions the unit into / out of the LOCKED state
+   */
+
+  function status($id, $status) {
+    $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'); }
+
+
  /**************************************************************************
   **************************************************************************
   **************************************************************************
@@ -248,9 +268,35 @@ class UnitsController extends AppController {
      $outstanding_deposit = $this->Unit->Lease->securityDepositBalance($unit['CurrentLease']['id']);
    }

-    // Set up dynamic menu items
-    if (isset($unit['CurrentLease']['id']) &&
-	!isset($unit['CurrentLease']['moveout_date'])) {
+    // If the unit is occupied, but not locked, provide a
+    // mechanism to do so.  This doesn't have to be restricted
+    // to past due customers.  There are times we need to
+    // overlock customers in good standing, such as if their
+    // lock breaks, is cut, or missing for any reason.
+    if ($this->Unit->occupied($unit['Unit']['status']) &&
+	!$this->Unit->locked($unit['Unit']['status']))
+      $this->addSideMenuLink('Lock',
+			     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->Unit->liened($unit['Unit']['status']))
+      $this->addSideMenuLink('Unlock',
+			     array('action' => 'unlock', $id), null,
+			     'ACTION');
+
+    // If there is a current lease on this unit, then provide
+    // a link to move the tenant out.  Current lease for a unit
+    // has a bit different definition than a current lease for
+    // a customer, since a lease stays with a customer until it
+    // is finally closed.  A lease, however, only stays with a
+    // unit while occupied (since a unit is not responsible for
+    // any lingering financial obligations, like a customer is).
+    // Of course, if there is no current lease, provide a link
+    // to move a new tenant in (if the unit is available).
+    if (isset($unit['CurrentLease']['id'])) {
      $this->addSideMenuLink('Move-Out',
 			     array('action' => 'move_out', $id), null,
 			     'ACTION');
@@ -262,8 +308,9 @@ class UnitsController extends AppController {
      // Unit is unavailable (dirty, damaged, reserved, business-use, etc)
    }

-    if (isset($unit['CurrentLease']['id']) &&
-	!isset($unit['CurrentLease']['close_date'])) {
+    // If there is a current lease, allow new charges to
+    // be added, and payments to be made.
+    if (isset($unit['CurrentLease']['id'])) {
      $this->addSideMenuLink('New Invoice',
 			     array('controller' => 'leases',
 				   'action' => 'invoice',
@@ -276,6 +323,7 @@ class UnitsController extends AppController {
 			     'ACTION');
    }

+    // Always allow the unit to be edited.
    $this->addSideMenuLink('Edit',
 			   array('action' => 'edit', $id), null,
 			   'ACTION');
@@ -343,7 +391,6 @@ class UnitsController extends AppController {
    $this->set(compact('unit_sizes'));

    // Prepare to render.
-    pr($this->data);
    $this->set(compact('title'));
  }

--- a/site/models/unit.php
+++ b/site/models/unit.php
@@ -87,6 +87,23 @@ class Unit extends AppModel {
    return $this->prReturn(true);
  }

+  function locked($enum) {
+    return $this->statusCheck($enum, 'LOCKED', false, null, false);
+  }
+
+  function conditionLocked() {
+    //return array('Unit.status' => 'LOCKED');
+    return ('Unit.status >= ' . $this->statusValue('LOCKED'));
+  }
+
+  function liened($enum) {
+    return $this->statusCheck($enum, 'LIENED', false, null, false);
+  }
+
+  function conditionLiened() {
+    return ('Unit.status >= ' . $this->statusValue('LIENED'));
+  }
+
  function occupied($enum) {
    return $this->statusCheck($enum, 'OCCUPIED', false, null, false);
  }