Got rid of LATE as a unit status, as it did not represent an physical condition. The logic was moved to Lease, where it is a much better fit. The sitemap still presents LATE units, as it is a useful view, but the underlying logic is driven from Lease, not Unit. This checkin also includes a small feature change to how late charges are assessed, as well as a menu item to kick off the charge assessments (both accidentally wedged in to this changeset).

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@547 97e9348a-65ac-dc4b-aefc-98561f571b83

controllers/leases_controller.php

@@ -3,10 +3,11 @@
 class LeasesController extends AppController {
 
   var $sidemenu_links =
-    array(array('name' => 'Leases',   'header' => true),
-	  array('name' => 'Active',   'url' => array('controller' => 'leases', 'action' => 'active')),
-	  array('name' => 'Closed',   'url' => array('controller' => 'leases', 'action' => 'closed')),
-	  array('name' => 'All',      'url' => array('controller' => 'leases', 'action' => 'all')),
+    array(array('name' => 'Leases',     'header' => true),
+	  array('name' => 'Active',     'url' => array('controller' => 'leases', 'action' => 'active')),
+	  array('name' => 'Closed',     'url' => array('controller' => 'leases', 'action' => 'closed')),
+	  array('name' => 'Delinquent', 'url' => array('controller' => 'leases', 'action' => 'delinquent')),
+	  array('name' => 'All',        'url' => array('controller' => 'leases', 'action' => 'all')),
 	  );
 
 
@@ -28,10 +29,11 @@ class LeasesController extends AppController {
    *  - Generate a listing of leases
    */
 
-  function index()    { $this->all(); }
-  function active()   { $this->gridView('Active Leases'); }
-  function closed()   { $this->gridView('Closed Leases'); }
-  function all()      { $this->gridView('All Leases', 'all'); }
+  function index()      { $this->all(); }
+  function active()     { $this->gridView('Active Leases'); }
+  function delinquent() { $this->gridView('Delinquent Leases'); }
+  function closed()     { $this->gridView('Closed Leases'); }
+  function all()        { $this->gridView('All Leases', 'all'); }
 
 
   /**************************************************************************
@@ -63,6 +65,8 @@ class LeasesController extends AppController {
 
   function gridDataFields(&$params, &$model) {
     $fields = parent::gridDataFields($params, $model);
+    $fields[] = ("IF(" . $this->Lease->conditionDelinquent() . "," .
+		 "   'DELINQUENT', 'CURRENT') AS 'status'");
     return array_merge($fields,
 		       $this->Lease->StatementEntry->chargeDisbursementFields(true));
   }
@@ -73,6 +77,9 @@ class LeasesController extends AppController {
     if ($params['action'] === 'active') {
       $conditions[] = 'Lease.close_date IS NULL';
     }
+    elseif ($params['action'] === 'delinquent') {
+      $conditions[] = $this->Lease->conditionDelinquent();
+    }
     elseif ($params['action'] === 'closed') {
       $conditions[] = 'Lease.close_date IS NOT NULL';
     }
@@ -422,7 +429,11 @@ class LeasesController extends AppController {
     $this->Lease->assessMonthlyLateAll($date);
     $this->redirect(array('action'=>'index'));
   }
-
+  function assess_all($date = null) {
+    $this->Lease->assessMonthlyRentAll($date);
+    $this->Lease->assessMonthlyLateAll($date);
+    $this->redirect(array('action'=>'index'));
+  }
 
   /**************************************************************************
    **************************************************************************
@@ -450,13 +461,7 @@ class LeasesController extends AppController {
 	     )
        );
 
-    $lease['Lease']['paid_through'] = $this->Lease->rentPaidThrough($id);
-
-
-    $this->set('charge_gaps', $this->Lease->rentChargeGaps($id));
-    $this->set('charge_through', $this->Lease->rentChargeThrough($id));
-
-     // Figure out the outstanding balances for this lease
+    // Figure out the outstanding balances for this lease
     $outstanding_balance = $this->Lease->balance($id);
     $outstanding_deposit = $this->Lease->securityDepositBalance($id);
 

controllers/maps_controller.php

@@ -95,7 +95,8 @@ class MapsController extends AppController {
 		   array('fields' => array()),
 
 		   'CurrentLease' =>
-		   array('fields' => array()),
+		   array('fields' => array($this->Map->Unit->CurrentLease->
+					   delinquentField('CurrentLease'))),
 
 		   'UnitSize' =>
 		   array('fields' => array('id', 'depth', 'width',
@@ -103,15 +104,14 @@ class MapsController extends AppController {
 					   'MapsUnit.pt_left',
 					   'MapsUnit.transpose')),
 		   ),
-	     'fields' => array_merge(array('id', 'name'),
-				     $this->Map->Unit->statusFields()),
+	     'fields' => array('id', 'name', 'status'),
 	     'conditions' => array('Map.id' => $id),
 	     ));
 
 /*     pr(compact('map', 'units')); */
 /*     $this->render('/fake'); */
 /*     return; */
-    
+
     /*****
      * The preference would be to leave all things "screen" related
      * to reside in the view.  However, two separate views need this
@@ -136,9 +136,6 @@ class MapsController extends AppController {
 
     // Go through each unit in the map, calculating the map location
     foreach ($units AS $unit) {
-      // Add the calculated fields to the Unit
-      $unit['Unit'] = $unit[0] + $unit['Unit'];
-
       $lft = $unit['MapsUnit']['pt_left'] + $boundary_adjustment;
       $top = $unit['MapsUnit']['pt_top']  + $boundary_adjustment;
 
@@ -167,7 +164,9 @@ class MapsController extends AppController {
 	       'width'  => $width,
 	       'depth'  => $depth,
 	       'n-s'    => $unit['MapsUnit']['transpose'] ? 0 : 1,
-	       'status' => $unit['Unit']['status']
+	       'status' => (($unit['Unit']['status'] === 'OCCUPIED' &&
+			     !empty($unit[0]['delinquent']))
+			    ? 'LATE' : $unit['Unit']['status'])
 	       );
     }
 
@@ -185,8 +184,10 @@ class MapsController extends AppController {
    */
 
   function legend($id = null, $requested_width = 400) {
-    $status = $this->Map->Unit->activeStatusEnums();
-    //pr($status);
+    $status = array_keys($this->Map->Unit->activeStatusEnums());
+    $occupied_key = array_search('OCCUPIED', $status);
+    array_splice($status, $occupied_key+1, 0, array('LATE'));
+
     $rows = 2;
     $cols = (int)((count($status) + $rows - 1) / $rows);
 
@@ -216,7 +217,7 @@ class MapsController extends AppController {
     $item_width *= $screen_adjustment_factor;
     $item_depth *= $screen_adjustment_factor;
 
-    foreach ($status AS $code => $value) {
+    foreach ($status AS $code) {
       $info['units'][] = array('name'   => $code,
 			       'status' => $code,
 			       'width'  => $item_width,
@@ -268,7 +269,7 @@ class MapsController extends AppController {
     $info['palate']['unit']['OCCUPIED']['bg']     = array('red' =>   0, 'green' => 128, 'blue' => 255);
     $info['palate']['unit']['LATE']['bg']         = array('red' => 255, 'green' => 192, 'blue' => 192);
     $info['palate']['unit']['LOCKED']['bg']       = array('red' => 255, 'green' =>  64, 'blue' =>  64);
-    $info['palate']['unit']['LIENED']['bg']       = array('red' => 255, 'green' => 128, 'blue' => 128);
+    $info['palate']['unit']['LIENED']['bg']       = array('red' => 255, 'green' =>   0, 'blue' => 128);
 
     // Determine text color to go with each background
     foreach ($info['palate']['unit'] AS &$code) {

controllers/units_controller.php

@@ -4,7 +4,6 @@ class UnitsController extends AppController {
 
   var $sidemenu_links =
     array(array('name' => 'Units',        'header' => true),
-	  array('name' => 'Delinquent',   'url' => array('controller' => 'units', 'action' => 'delinquent')),
 	  array('name' => 'Occupied',     'url' => array('controller' => 'units', 'action' => 'occupied')),
 	  array('name' => 'Vacant',       'url' => array('controller' => 'units', 'action' => 'vacant')),
 	  array('name' => 'Unavailable',  'url' => array('controller' => 'units', 'action' => 'unavailable')),
@@ -34,7 +33,6 @@ class UnitsController extends AppController {
   function unavailable() { $this->gridView('Unavailable Units'); }
   function vacant()      { $this->gridView('Vacant Units'); }
   function occupied()    { $this->gridView('Occupied Units'); }
-  function delinquent()  { $this->gridView('Delinquent Units'); }
   function all()         { $this->gridView('All Units', 'all'); }
 
 
@@ -84,7 +82,6 @@ class UnitsController extends AppController {
     $fields = parent::gridDataFields($params, $model);
 
     return array_merge($fields,
-		       $this->Unit->statusFields(),
 		       $this->Unit->Lease->StatementEntry->chargeDisbursementFields(true));
   }
 
@@ -100,9 +97,6 @@ class UnitsController extends AppController {
     elseif ($params['action'] === 'occupied') {
       $conditions[] = $this->Unit->conditionOccupied();
     }
-    elseif ($params['action'] === 'delinquent') {
-      $conditions[] = $this->Unit->conditionDelinquent();
-    }
     elseif ($params['action'] === 'unoccupied') {
       $conditions[] = array('NOT' => array($this->Unit->conditionOccupied()));
     }
@@ -216,8 +210,6 @@ class UnitsController extends AppController {
 		    'Lease' => array('Customer'),
 		    'CurrentLease' => array('Customer')
 		   ),
-	     'fields' => array_merge(array('Unit.*'),
-				     $this->Unit->statusFields()),
 	     'conditions' => array('Unit.id' => $id),
 	     ));
     $unit['Unit'] = $unit[0] + $unit['Unit'];