Mace moving table in supplier main board work and specced

2014-05-28 17:26:47 +02:00
parent 8faf5f3c0a
commit 901c9ac5c8
12 changed files with 34 additions and 14 deletions
@@ -9,7 +9,7 @@ Qsupplier.App.List = DS.Model.extend
  has_active_orders: attr 'boolean'
  price: attr 'number'
  closed_at: DS.attr('date')
-  table_number: attr 'number'
+  #table_number: attr 'number'
  table: DS.belongsTo('table', inverse: 'active_list')
  #users: DS.hasMany('user', inverse: 'active_list')
  orders: DS.hasMany('order')
@@ -4,7 +4,7 @@ td.status-icons
  if view.content.needs_payment
    |  
    span.icon.needs-payment
-td.numeric.table_number {{view.content.table_number}}
+td.numeric.table_number {{view.content.table.number}}
 td.section_title {{view.content.section.title}}
 td.currency.total_list_amount {{currency view.content.price}}
 td.actions
@@ -3,7 +3,7 @@ td.status-icons
 td {{view.content.display}}
 td.numeric.table_number
  view Qsupplier.App.ActiveOrderTableNumberView contextBinding="view.content"
-td.section_title {{view.content.section.title}}
+td.section_title {{view.content.list.section.title}}
 td.currency {{currency view.content.total }}
 td.actions
  if view.content.placed
@@ -1,3 +1,3 @@
-.number= list.table_number
+.number= list.table.number
 .extra-list-info
  img.spinner src="/assets/spinner.gif" alt=""
@@ -29,10 +29,8 @@
    view Ember.TextField valueBinding="width" class="dimension section-edit-width-field"
    span x
    view Ember.TextField valueBinding="height" class="dimension section-edit-height-field"
-    a.btn.btn-mini.section-normal-mode-button{ action finishEditable }
-      span.icon-ok
+    a.section-normal-mode-button{ action finishEditable }: span
  else
-    a.btn.btn-mini.section-edit-mode-button{ action makeEditable }
-      span.icon-pencil
+    a.section-edit-mode-button{ action makeEditable }: span
 each table in tables
  view 'Qsupplier.App.SectionTableView' contentBinding="table"