From 87881177ab39b7aaada63f3efc2c32270b793ffb Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 17 Dec 2014 17:51:31 +0100 Subject: [PATCH] Fix closing list problem not unlinking the table active list --- .../javascripts/supplier/app/models/list.js.coffee | 1 + .../javascripts/supplier/app/models/order.js.coffee | 4 ++++ .../supplier/app/templates/section_table.emblem | 13 +++++++++---- .../supplier/app/templates/table_actions.emblem | 6 ------ .../supplier/app/views/table_actions_view.js.coffee | 3 --- .../foundation1/components/_section_tables.css.sass | 9 +++++++++ .../suppliers/section_view_steps.rb | 1 + wip.md | 8 -------- 8 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 app/assets/javascripts/supplier/app/templates/table_actions.emblem delete mode 100644 app/assets/javascripts/supplier/app/views/table_actions_view.js.coffee diff --git a/app/assets/javascripts/supplier/app/models/list.js.coffee b/app/assets/javascripts/supplier/app/models/list.js.coffee index 8f87ea1a..ccce380f 100644 --- a/app/assets/javascripts/supplier/app/models/list.js.coffee +++ b/app/assets/javascripts/supplier/app/models/list.js.coffee @@ -21,6 +21,7 @@ App.List = DS.Model.extend markClosed: -> @set('state', 'closed') #@set 'has_active_orders', false + @set 'table', null @markHelped() @markIsPaid() markHelped: -> diff --git a/app/assets/javascripts/supplier/app/models/order.js.coffee b/app/assets/javascripts/supplier/app/models/order.js.coffee index 1232f0c4..e5958877 100644 --- a/app/assets/javascripts/supplier/app/models/order.js.coffee +++ b/app/assets/javascripts/supplier/app/models/order.js.coffee @@ -32,3 +32,7 @@ App.Order = DS.Model.extend display: (-> @get('product_orders').map((po) -> "#{po.get('quantity')} x #{po.get('product.name')}").join(', ') ).property('product_orders.@each.quantity', 'product_orders.@each.product.@each.name') + + display_tag: (-> + "#{@get('display')}".htmlSafe() + ).property('display', 'state') diff --git a/app/assets/javascripts/supplier/app/templates/section_table.emblem b/app/assets/javascripts/supplier/app/templates/section_table.emblem index fed8e1e1..efeddde4 100644 --- a/app/assets/javascripts/supplier/app/templates/section_table.emblem +++ b/app/assets/javascripts/supplier/app/templates/section_table.emblem @@ -6,10 +6,15 @@ if table.active_list div.table-actions .title= table.number - .table-action-row - = view "mark-list-helped-button" contentBinding="table.active_list" - = view "close-list-button" contentBinding="table.active_list" - .table-action-row=currency table.active_list.total + if table.active_list + .table-action-row + = view "mark-list-helped-button" contentBinding="table.active_list" + = view "close-list-button" contentBinding="table.active_list" + each order in table.active_list.active_orders + .table-action-row= order.display_tag + .table-action-row.total + = link-to "list" table.active_list + =currency table.active_list.total /.table-action-row a{action "editTable" table}: span.fa.fa-lg.fa-wrench each user in table.active_list.users diff --git a/app/assets/javascripts/supplier/app/templates/table_actions.emblem b/app/assets/javascripts/supplier/app/templates/table_actions.emblem deleted file mode 100644 index 5343b77c..00000000 --- a/app/assets/javascripts/supplier/app/templates/table_actions.emblem +++ /dev/null @@ -1,6 +0,0 @@ -if content.list.needs_help - li - button.btn.btn-info.btn-small id="list-is-helped-button-#{content.list.id}" onclick="Qsupplier.mark_list_as_helped('{{content.list.id}}')" {{t "list.is_helped_button"}} - button.btn.btn-warning.btn-small class="of-list-#{content.list.id}" onclick="Qsupplier.close_list('#{content.list.id}')" data-t="list.close_list" -li - a data-t='section.tables_view.table_actions.got_to_table' href="suppliers_table_path(@table)" {{t 'section.tables_view.table_actions.got_to_table'}} diff --git a/app/assets/javascripts/supplier/app/views/table_actions_view.js.coffee b/app/assets/javascripts/supplier/app/views/table_actions_view.js.coffee deleted file mode 100644 index ed2851df..00000000 --- a/app/assets/javascripts/supplier/app/views/table_actions_view.js.coffee +++ /dev/null @@ -1,3 +0,0 @@ -App.TableActionsView = Ember.Component.extend - tagName: 'ul' - templateName: 'table_actions' diff --git a/app/assets/stylesheets/supplier/foundation1/components/_section_tables.css.sass b/app/assets/stylesheets/supplier/foundation1/components/_section_tables.css.sass index 56e1abe7..5c52847d 100644 --- a/app/assets/stylesheets/supplier/foundation1/components/_section_tables.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/components/_section_tables.css.sass @@ -102,6 +102,15 @@ background-color: #aaa .table-action-row margin-top: 10px + &.total + font-size: 1.2em + font-weight: bold + .order-display + &.active + .post-display + margin-left: 10px + @extend .fa + @extend .fa-check .table-settings width: 200px height: 30px diff --git a/spec/acceptance_steps/suppliers/section_view_steps.rb b/spec/acceptance_steps/suppliers/section_view_steps.rb index 3885616b..8787d6cb 100644 --- a/spec/acceptance_steps/suppliers/section_view_steps.rb +++ b/spec/acceptance_steps/suppliers/section_view_steps.rb @@ -74,6 +74,7 @@ step "the section table should not have any active list markings anymore" do css_class.should_not include 'occupied' css_class.should_not include 'active_order' css_class.should_not include 'needs_payment' + ember_find('table', @table.id)['active_list_id'].should_not be_present end step "I should be redirected to the supplier section view" do diff --git a/wip.md b/wip.md index 62a1a251..346e0497 100644 --- a/wip.md +++ b/wip.md @@ -16,8 +16,6 @@ User ---- - test met veel producten -- splash screen - - ios - product variants - remove active orders on list close @@ -32,7 +30,6 @@ General - split off faye server - split off counter server - - rails runner Supplier.reset_counters on start! Post release ============ @@ -61,13 +58,8 @@ Promotion Supplier -------- -- Counters display similar to users - tables#index Make table actions available -- Products to ember -- Product categories to ember -- Event stream to ember - Section view, add go to list button right next to edit section button -- Replace product categories jquery sortable by ember version - https://github.com/buytruckload/geonames_api - Section view - add order vinkjes (active, delivered) management to table actions (post release)