Display colors according to late status.

diff --git a/haxe/ItemScheduler.hx b/haxe/ItemScheduler.hx
index e286bc0bc98277235b0cb498f0c7f5c54f99c50a..3c11e12663a1449cf1c485c910ca29157d09e6b8 100644 (file)
--- a/haxe/ItemScheduler.hx
+++ b/haxe/ItemScheduler.hx
@@ -42,6 +42,10 @@ class FA {
        static public function tb() : String {
                return untyped __php__('TB_PREF');
        }
+
+       static public function sql2date(sqlDate:Dynamic) : Null<Date> {
+               return sqlDate == null ? null : Date.fromString(sqlDate);
+       }
 }
 class ItemScheduler {
        var stock_id:String;
@@ -54,7 +58,7 @@ class ItemScheduler {
        }
 
        function tableHeader() {
-               return ["Order", "Customer", "Quantity", "Before", "After", "Loc", "From",  "Required Date"];
+               return ["Order", "Customer", "Quantity", "Before", "After", "Loc", "From",  "Required Date", "Comment"];
        }
 
 /*
@@ -114,7 +118,7 @@ class ItemScheduler {
                php.Lib.print('<tr '+attributes.join(' ')+'>');
                for(td in tds) {
                        php.Lib.print('<td>');
-                       php.Lib.print(td);
+                       if(td) php.Lib.print(td);
                        php.Lib.print('</td>');
                }
                php.Lib.print('</tr>');
@@ -142,6 +146,14 @@ class ItemScheduler {
                        /* The order can also be late if we need
                         * to wait for a delivery to get it
                         */
+               var required_by : Date = FA.sql2date(order.required_date);
+               if(required_by == null) required_by = FA.sql2date(order.delivery_date);
+               if(required_by.getTime() < date.getTime()) {
+                       classes.push('late');
+               }
+               else {
+                       classes.push('on_time');
+               }
                        var cells : Array <Dynamic> = [
                                order.order_id
                                ,order.deliver_to
@@ -197,6 +209,8 @@ class ItemScheduler {
                        ,left
                        ,location.code
                        ,location.delivery
+                       ,""
+                       ,""
                ];
 
                printRow(cells, ['class = "tableheader location"']);

diff --git a/item_schedule.php b/item_schedule.php
index 97f397c30dcee51ab6277bfc265b55fec11f1b02..95463a336264500ddf4d6611f2dc217907c3d96f 100644 (file)
--- a/item_schedule.php
+++ b/item_schedule.php
@@ -77,16 +77,24 @@ end_form();
 end_page();
 ?>
 <style type='text/css'>
-tr.soldout {
-               background: pink;
-}
 tr.partial {
-               background: orange;
+       color: darkred;
 }
 
 tr.location {
        font-weight: normal;
+               background: #8f8;
        #color: blue;
 }
+tr.on_time {
+}
+
+tr.late {
+               background: #fc8;
+}
+
+tr.soldout {
+               background: pink;
+}
 
 </style>