git://git.iain.cx/iain / readifood.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e2ec797)
Allow reordering the delivery list. 2013-12-12
authorIain Patterson <me@iain.cx>
Thu, 12 Dec 2013 18:15:05 +0000 (13:15 -0500)
committerIain Patterson <me@iain.cx>
Thu, 12 Dec 2013 18:15:05 +0000 (13:15 -0500)
Delivery details are retrieved from the database in an undefined order.
They can now be dragged and dropped to reorder into a schedule which is
more convenient for a driver to read.

lib/delivery.php patch | blob | history
lib/header.php patch | blob | history
www/jquery.sortable.js [new file with mode: 0644] patch | blob
www/style.css patch | blob | history

diff --git a/lib/delivery.php b/lib/delivery.php
index 3b45558..9cdd338 100644 (file)
--- a/lib/delivery.php
+++ b/lib/delivery.php
@@ -109,10 +109,29 @@
 
     $q = new OrderQuery;
     $orders = $q->filterById(get_driver_schedule_by_order_id($contact->getId(), $order_ids))->find();
 
     $q = new OrderQuery;
     $orders = $q->filterById(get_driver_schedule_by_order_id($contact->getId(), $order_ids))->find();
+
+    /*
+      Only allow drag and drop if there's more than one order otherwise IE will
+      mess up the CSS.
+    */
+    $count = count($orders);
+    if ($count) {
+      foreach ($orders as $order) {
+        if (! get_contact_by_id($order->getBeneficiaryId())) $count--;
+      }
+    }
+
+    if ($count > 1) {
+      echo "<div class=\"sortable\">\n";
+      echo "<p class=\"noprint\">Drag delivery details to reorder the schedule.</p>\n";
+    }
+
     foreach ($orders as $order) {
       $contact = get_contact_by_id($order->getBeneficiaryId());
       if (! $contact) continue;
 
     foreach ($orders as $order) {
       $contact = get_contact_by_id($order->getBeneficiaryId());
       if (! $contact) continue;
 
+      echo "<span>\n";
+
       $phones = array();
       $area = get_contact_area($contact);
       echo "<p>Order of <em>" . get_order_parcel_string($order) . "</em> for <strong>" . htmlspecialchars($contact->getDisplayname()) . "</strong> in " . htmlspecialchars(get_area_displayname($area)) . ".</p>\n";
       $phones = array();
       $area = get_contact_area($contact);
       echo "<p>Order of <em>" . get_order_parcel_string($order) . "</em> for <strong>" . htmlspecialchars($contact->getDisplayname()) . "</strong> in " . htmlspecialchars(get_area_displayname($area)) . ".</p>\n";
@@ -150,8 +169,11 @@
         echo "</p>\n";
       }
 
         echo "</p>\n";
       }
 
-      echo "<hr>\n\n";
+      echo "<hr>\n";
+      echo "</span>\n\n";
     }
     }
+
+    if ($count > 1) echo "</div>\n";
   }
 
   function show_delivery_date_form($date = null) {
   }
 
   function show_delivery_date_form($date = null) {
diff --git a/lib/header.php b/lib/header.php
index e8b89da..1451a04 100644 (file)
--- a/lib/header.php
+++ b/lib/header.php
@@ -7,6 +7,7 @@
   echo "<script src=\"$http://code.jquery.com/ui/1.10.3/jquery-ui.js\"></script>\n";
 ?>
 <script src="/jquery.autosize.js"></script>
   echo "<script src=\"$http://code.jquery.com/ui/1.10.3/jquery-ui.js\"></script>\n";
 ?>
 <script src="/jquery.autosize.js"></script>
+<script src="/jquery.sortable.js"></script>
 </head>
 <body>
 
 </head>
 <body>
 
diff --git a/www/jquery.sortable.js b/www/jquery.sortable.js
new file mode 100644 (file)
index 0000000..3e59fe6
--- /dev/null
+++ b/www/jquery.sortable.js
@@ -0,0 +1,11 @@
+$(function() {
+ $(".sortable").sortable({
+   axis: "y",
+   containment: "parent",
+   placeholder: "sortplaceholder",
+   forcePlaceholderSize: true,
+   start: function( event, ui ) { ui.item.addClass('sortdragging'); },
+   stop: function( event, ui ) { ui.item.removeClass('sortdragging'); },
+ });
+ $(".sortable").disableSelection();
+});
diff --git a/www/style.css b/www/style.css
index 79f7f55..96c3cda 100644 (file)
--- a/www/style.css
+++ b/www/style.css
@@ -108,3 +108,27 @@ table.report > * > tr > td {
   height: 375px;
   background: #eeeeee;
 }
   height: 375px;
   background: #eeeeee;
 }
+
+.sortdragging {
+  border-color: black;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: 0.5em;
+  padding-bottom: 1em;
+  background: #eeeeee;
+}
+
+span.sortdragging hr {
+  display: none;
+}
+
+.sortplaceholder {
+  border-color: black;
+  border-width: 1px;
+  border-style: dotted;
+  border-radius: 0.5em;
+  background: #ffffee;
+  height: 2em;
+  position: absolute;
+}
+
Order tracking for Readifood charity.