diff --git a/app/assets/javascripts/supplier/app/models/list.js.coffee b/app/assets/javascripts/supplier/app/models/list.js.coffee index 0081f95d..60ec4802 100644 --- a/app/assets/javascripts/supplier/app/models/list.js.coffee +++ b/app/assets/javascripts/supplier/app/models/list.js.coffee @@ -16,7 +16,7 @@ Qsupplier.App.List = DS.Model.extend orders: DS.hasMany('order') section: DS.belongsTo('section') section_id: attr('string') - active: ( -> @get('state') == 'active' ).property('state') + active: ( -> @get('state') is 'active' ).property('state') markClosed: -> @set('state', 'closed') #@set 'has_active_orders', false diff --git a/app/assets/javascripts/supplier/app/templates/table.emblem b/app/assets/javascripts/supplier/app/templates/table.emblem index 40fc1b79..6b5395ea 100644 --- a/app/assets/javascripts/supplier/app/templates/table.emblem +++ b/app/assets/javascripts/supplier/app/templates/table.emblem @@ -1,17 +1,17 @@ -.table-number {{table.number}} +.table-number= table.number .status-icons span.needs_payment span.needs_help span.active_order -div class="table-actions table-actions-#{unbound table.id}" - .title= table.number - if table.active_list +if table.active_list + div class="table-actions table-actions-#{unbound table.id}" + .title= table.number .table-action-row Qsupplier.App.MarkListHelpedButtonView content=table.active_list Qsupplier.App.CloseListButtonView content=table.active_list .table-action-row=currency table.active_list.total - each user in table.active_list.users - img src=user.facebook_image + each user in table.active_list.users + img src=user.facebook_image if editmodedisabled .table-settings select diff --git a/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee b/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee index 913e0c79..204ed72d 100644 --- a/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee +++ b/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee @@ -32,7 +32,9 @@ root.Qsupplier= if list = Qsupplier.App.List.findCached(e.data.id) list.markIsPaid() else if e.event == 'list_update' - Qsupplier.App.List.updateOrAdd(e.data.list) if Qsupplier.App + if Qsupplier.App + list = Qsupplier.App.List.updateOrAdd(e.data.list) + debugger else if e.event == 'list_closed' if Qsupplier.App and list = Qsupplier.App.List.findCached(e.data.id) list.markClosed() diff --git a/wip.md b/wip.md index dc08bc19..2a144612 100644 --- a/wip.md +++ b/wip.md @@ -44,7 +44,18 @@ User General ------- -- search for class btn and replace with font awesome correct styling if needed Bugs: - Dragging supplier table from one section to the other fails - Supplier section print qr codes does not give proper images - Supplier tables pagination styling - supplier counters in user view (no supplier in active list?) - supplier main board section selector selects first section option and not the supplier name, which is added using prompt thingy. Maybe setting ApplicationController.active_section in stead of IndexController.active_section for scope locking - supplier main board mark list as helped button styling is a bit off +- search for class btn and replace with font awesome correct styling if needed + +Bugs +---- + +- Dragging supplier table from one section to the other fails +- Supplier section print qr codes does not give proper images +- Supplier tables pagination styling +- supplier counters in user view (no supplier in active list?) +- supplier main board section selector selects first section option and not the supplier name, which is added using prompt thingy. Maybe setting ApplicationController.active_section in stead of IndexController.active_section for scope locking +- supplier main board mark list as helped button styling is a bit off +- Supplier section view table does not get activated on new list creation Post release ============