Picked = Green + fix null quantity => 0.

diff --git a/haxe/ItemScheduler.hx b/haxe/ItemScheduler.hx
index 8a92d77327300109d89aa287b0d20822f5ec37b2..4799420e0399fb1e218dfd11290d606724b6ba3c 100644 (file)
--- a/haxe/ItemScheduler.hx
+++ b/haxe/ItemScheduler.hx
@@ -266,7 +266,7 @@ class ItemScheduler {
                if (user_pick == null) user_pick = 0;
                        var inputs : Array<String> = [];
                if(maxQuantity > 12) {
-                       inputs.push('<span class="picked">'+quantity+' </span>');
+                       inputs.push('<span class="picked">'+(quantity == null ? 0 : quantity)+' </span>');
                        inputs.push('<input type="text" name="'+row_id+'[to_pick]" value="'+user_pick+'" onchange=\'onPick(this);\'>');
                }
                else  {

diff --git a/hincludes/lib/ItemScheduler.class.php b/hincludes/lib/ItemScheduler.class.php
index cc083f9dd86a10fe2d6bf20b9c22d5c6d79c37fb..9e55a207f2bb5bb9b994917f2ba2caf63d59355d 100644 (file)
--- a/hincludes/lib/ItemScheduler.class.php
+++ b/hincludes/lib/ItemScheduler.class.php
@@ -120,7 +120,7 @@ class ItemScheduler {
                }
                $inputs = new _hx_array(array());
                if($maxQuantity > 12) {
-                       $inputs->push("<span class=\"picked\">" . _hx_string_rec($quantity, "") . " </span>");
+                       $inputs->push("<span class=\"picked\">" . _hx_string_rec(((($quantity === null) ? 0 : $quantity)), "") . " </span>");
                        $inputs->push("<input type=\"text\" name=\"" . $row_id . "[to_pick]\" value=\"" . _hx_string_rec($user_pick, "") . "\" onchange='onPick(this);'>");
                } else {
                        $inputs->push("<span class=\"pickable\">");

diff --git a/item_schedule.php b/item_schedule.php
index 9379528064e86ccda90753c40c826336a016fc24..9eac399baa1838faa43ca7e42e27c7bd1f31b26e 100644 (file)
--- a/item_schedule.php
+++ b/item_schedule.php
@@ -112,7 +112,12 @@ tr.partial  td:nth-child(5) {
        background: pink;
 }
 
+
 tr.location {
+       font-weight: normal;
+               background: #bbb;
+}
+tr.picked {
        font-weight: normal;
                background: #8f8;
 }