From b2d973c542262c998b383eeb06d43176408703f9 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Fri, 19 Sep 2014 17:19:42 +0200 Subject: [PATCH] Add order time to supplier dashboard --- .../javascripts/supplier/app/templates/active_order.emblem | 1 + app/assets/javascripts/supplier/app/templates/index.emblem | 1 + .../stylesheets/supplier/foundation1/application.css.sass | 1 - .../{_qtables.css.sass => components/_tables.css.sass} | 4 ++++ wip.md | 2 -- 5 files changed, 6 insertions(+), 3 deletions(-) rename app/assets/stylesheets/supplier/foundation1/{_qtables.css.sass => components/_tables.css.sass} (92%) diff --git a/app/assets/javascripts/supplier/app/templates/active_order.emblem b/app/assets/javascripts/supplier/app/templates/active_order.emblem index d29a1f07..1416b9c1 100644 --- a/app/assets/javascripts/supplier/app/templates/active_order.emblem +++ b/app/assets/javascripts/supplier/app/templates/active_order.emblem @@ -7,6 +7,7 @@ td= view.content.display td.numeric.table_number: App.TableNumberWithInfoView contextBinding="view.content.list" td.section_title: link-to 'section' view.content.list.table.section.id: span=view.content.list.table.section.title td.currency=currency view.content.total +td.time= time view.content.created_at format="HH:mm" td.actions if view.content.placed button.mark_order_active{ action "markOrderActive" view.content.id} diff --git a/app/assets/javascripts/supplier/app/templates/index.emblem b/app/assets/javascripts/supplier/app/templates/index.emblem index 427a5f73..b764571e 100644 --- a/app/assets/javascripts/supplier/app/templates/index.emblem +++ b/app/assets/javascripts/supplier/app/templates/index.emblem @@ -27,6 +27,7 @@ th.numeric=t 'table_number' th=t 'models.section' th.currency=t 'active_orders.price' + th.time th.actions tbody each order in controller.active_orders: App.ActiveOrderView contentBinding="order" diff --git a/app/assets/stylesheets/supplier/foundation1/application.css.sass b/app/assets/stylesheets/supplier/foundation1/application.css.sass index 4e69f639..77c82c31 100644 --- a/app/assets/stylesheets/supplier/foundation1/application.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/application.css.sass @@ -11,7 +11,6 @@ @import ./menu_main @import ./menu_side @import ./qsections -@import ./qtables @import ./section_tab_headers @import ./qlists @import ./qmodal diff --git a/app/assets/stylesheets/supplier/foundation1/_qtables.css.sass b/app/assets/stylesheets/supplier/foundation1/components/_tables.css.sass similarity index 92% rename from app/assets/stylesheets/supplier/foundation1/_qtables.css.sass rename to app/assets/stylesheets/supplier/foundation1/components/_tables.css.sass index fe733b61..010e7531 100644 --- a/app/assets/stylesheets/supplier/foundation1/_qtables.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/components/_tables.css.sass @@ -12,6 +12,10 @@ table text-align: center &.currency text-align: right + &.time + text-align: right + &.date + text-align: right .table-edit +button($bg: $secondary-color) +button-icon-only diff --git a/wip.md b/wip.md index f19d9e9b..6613e2c4 100644 --- a/wip.md +++ b/wip.md @@ -9,14 +9,12 @@ Supplier - Dashboard - Empty state - Add qr print functionality offering to send the stickers -- Show order time in dashboard User ---- - test met veel producten - splash screen -- Fix styling after 4.2 update Bugs ----