Some more changes because I cannot stop

This commit is contained in:
2014-07-22 22:29:25 +02:00
parent 1f2c3d1dde
commit bbd3234c7b
4 changed files with 22 additions and 9 deletions
@@ -16,7 +16,7 @@ Qsupplier.App.List = DS.Model.extend
orders: DS.hasMany('order') orders: DS.hasMany('order')
section: DS.belongsTo('section') section: DS.belongsTo('section')
section_id: attr('string') section_id: attr('string')
active: ( -> @get('state') == 'active' ).property('state') active: ( -> @get('state') is 'active' ).property('state')
markClosed: -> markClosed: ->
@set('state', 'closed') @set('state', 'closed')
#@set 'has_active_orders', false #@set 'has_active_orders', false
@@ -1,11 +1,11 @@
.table-number {{table.number}} .table-number= table.number
.status-icons .status-icons
span.needs_payment span.needs_payment
span.needs_help span.needs_help
span.active_order span.active_order
div class="table-actions table-actions-#{unbound table.id}" if table.active_list
div class="table-actions table-actions-#{unbound table.id}"
.title= table.number .title= table.number
if table.active_list
.table-action-row .table-action-row
Qsupplier.App.MarkListHelpedButtonView content=table.active_list Qsupplier.App.MarkListHelpedButtonView content=table.active_list
Qsupplier.App.CloseListButtonView content=table.active_list Qsupplier.App.CloseListButtonView content=table.active_list
@@ -32,7 +32,9 @@ root.Qsupplier=
if list = Qsupplier.App.List.findCached(e.data.id) if list = Qsupplier.App.List.findCached(e.data.id)
list.markIsPaid() list.markIsPaid()
else if e.event == 'list_update' 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' else if e.event == 'list_closed'
if Qsupplier.App and list = Qsupplier.App.List.findCached(e.data.id) if Qsupplier.App and list = Qsupplier.App.List.findCached(e.data.id)
list.markClosed() list.markClosed()
+12 -1
View File
@@ -44,7 +44,18 @@ User
General 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 Post release
============ ============