From 754806b61fc8711707fbf476f265501cf36705ff Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Tue, 11 Dec 2012 15:39:40 +0100
Subject: [PATCH] styling fixes and fix for supplier deleted products...

---
 .../bootstrap_and_overrides.css.sass           |  5 ++++-
 app/assets/stylesheets/user/structure.css.sass |  2 +-
 app/models/list.rb                             |  2 +-
 app/models/product_order.rb                    |  5 +++++
 app/views/layouts/tablet.html.slim             |  1 -
 app/views/user/history_list.html.slim          | 18 +++++++++++-------
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass b/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass
index 9699b837..dddd219a 100644
--- a/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass
+++ b/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass
@@ -1,6 +1,9 @@
 @import "bootstrap"
 body 
-	padding-top: 42px
+  padding-top: 42px
+  .table
+    &.table-condensed
+      margin-bottom: 5px
 @import "bootstrap-responsive"
 
 // Set the correct sprite paths
diff --git a/app/assets/stylesheets/user/structure.css.sass b/app/assets/stylesheets/user/structure.css.sass
index 087b6379..bdb1779b 100644
--- a/app/assets/stylesheets/user/structure.css.sass
+++ b/app/assets/stylesheets/user/structure.css.sass
@@ -11,7 +11,7 @@ body
   .home-panel
     margin-left: 20px
     margin-right: 20px
-    margin-top: 40px
+    margin-top: 16px
     +box-shadow(#000 10px 10px 16px)
     background-color: rgba(240, 240, 240, 0.6)
     +border-radius(10px)
diff --git a/app/models/list.rb b/app/models/list.rb
index 21118092..024f6727 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -264,7 +264,7 @@ class List
       order_total = 0.0
       for product_order in order.product_orders
         order_total += (product_order.amount * product_order.price).round(2)
-        ho[:products] << {name: product_order.product.name, id: product_order.product_id, number: product_order.amount, price: product_order.price}
+        ho[:products] << {name: product_order.product_name, id: product_order.product_id, number: product_order.amount, price: product_order.price}
       end
       ho[:total_amount] = order_total.round(2)
       ho[:state] = order.state
diff --git a/app/models/product_order.rb b/app/models/product_order.rb
index f9f6ccf9..ad4ac49f 100644
--- a/app/models/product_order.rb
+++ b/app/models/product_order.rb
@@ -10,4 +10,9 @@ class ProductOrder
   view :by_product_id, key: :product_id
   view :by_order_id, key: :order_id
 
+  # Getter for product name. If a supplier deletes a product, that has product_orders, the product
+  # will become nil. This method should handle this case.
+  def product_name
+    product.try(:name) || '[deleted]'
+  end
 end
diff --git a/app/views/layouts/tablet.html.slim b/app/views/layouts/tablet.html.slim
index 4b5dd41e..0e37438e 100644
--- a/app/views/layouts/tablet.html.slim
+++ b/app/views/layouts/tablet.html.slim
@@ -50,7 +50,6 @@ html lang="en"
               //li= link_to t('supplier.menu.active_orders', orders: Order.model_name.human_plural), supplier_active_orders_path
               //li= link_to t('supplier.menu.active_lists', lists: List.model_name.human_plural), supplier_active_lists_path
               li= link_to ProductCategory.model_name.human_plural, suppliers_product_categories_path
-              li= link_to ProductCategory.model_name.human_plural, suppliers_product_categories_path
               li= link_to Product.model_name.human_plural, suppliers_products_path
               li= link_to Section.model_name.human_plural, suppliers_sections_path
               li= link_to Table.model_name.human_plural, suppliers_tables_path
diff --git a/app/views/user/history_list.html.slim b/app/views/user/history_list.html.slim
index 64556131..1355b264 100644
--- a/app/views/user/history_list.html.slim
+++ b/app/views/user/history_list.html.slim
@@ -2,13 +2,17 @@
   .pull-right
     .table-number
     .supplier-name
-dl.dl-horizontal
-  dt data-t="attributes.list.created_at" = List.human_attribute_name(:created_at)
-  dd.list-created-at
-  dt data-t="attributes.list.closed_at" = List.human_attribute_name(:closed_at)
-  dd.list-closed-at
-  dt data-t="models.supplier" = Supplier.model_name.human
-  dd.supplier-name
+table.table.table-condensed
+  tbody
+    tr
+      td.key data-t="attributes.list.created_at" = List.human_attribute_name(:created_at)
+      td.value.list-created-at
+    tr
+      td.key data-t="attributes.list.closed_at" = List.human_attribute_name(:closed_at)
+      td.value.list-closed-at
+    tr
+      td.key data-t="models.supplier" = Supplier.model_name.human
+      td.value.supplier-name
 .well
   table#history-list-table.table.list-table
     thead