From cbab39abf44adfe88570d0973237d30ecb45b3cc Mon Sep 17 00:00:00 2001 From: Maxime Bourget Date: Thu, 30 May 2013 21:33:37 +0100 Subject: [PATCH] Display colors according to late status. --- haxe/ItemScheduler.hx | 18 ++++++++++++++++-- item_schedule.php | 16 ++++++++++++---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/haxe/ItemScheduler.hx b/haxe/ItemScheduler.hx index e286bc0..3c11e12 100644 --- 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 { + 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(''); for(td in tds) { php.Lib.print(''); - php.Lib.print(td); + if(td) php.Lib.print(td); php.Lib.print(''); } php.Lib.print(''); @@ -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 = [ 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 97f397c..95463a3 100644 --- a/item_schedule.php +++ b/item_schedule.php @@ -77,16 +77,24 @@ end_form(); end_page(); ?> -- 2.30.2