upgrade refactor

2016-06-02 14:40:30 +02:00
parent 1acd200408
commit eb368a31ca
25 changed files with 36 additions and 30 deletions
@@ -40,8 +40,8 @@ App.Order = DS.Model.extend

  display_with_table: (->
    table = t('models.table').toLowerCase()
-    "#{@get('display')} #{table} #{@get('list.table.number')}".htmlSafe()
-  ).property('display', 'list.table.number')
+    "#{@get('display')} #{table} #{@get('list.table.table_number')}".htmlSafe()
+  ).property('display', 'list.table.table_number')

  display_tag: (->
    "<span class='display order-display order-#{@get('id')} #{@get('state')}'><span class='pre-display'></span>#{@get('display')}<span class='post-display'></span></span>".htmlSafe()
@@ -18,3 +18,4 @@ App.Table = DS.Model.extend
  # Casted number to use in sortBy because a numberField will
  # set property number to string value (TablesIndexController)
  casted_number: (-> parseInt(@get('number'))).property('number')
+  table_number: Ember.computed.alias('number')
@@ -14,7 +14,7 @@ App.Router.map ->
    @resource 'list', path: ':list_id'
  @route 'employees'
  @route 'employee', path: '/employees/:employee_id'
-  @route 'page', path: 'pages/:page_id'
+  @resource 'page', path: 'pages/:page_id'
  @route 'orders-display' # chromecast etc
  @route 'menu'
  @route 'settings'
@@ -121,7 +121,7 @@ App.ApplicationRoute = Ember.Route.extend
      if list = @store.peekRecord('list', data.id)
        list.isNeedingHelp()
        return if @get('globals.active_section.id') and list.get('section.id') isnt @get('globals.active_section.id')
-        @set 'globals.flash_message', t('table.needs_help.flash_message', number: list.get('table.number') || -1)
+        @set 'globals.flash_message', t('table.needs_help.flash_message', number: list.get('table.table_number') || -1)
        try ion.sound.play 'bell_ring'
    list_needs_payment: (data) ->
      if list = @store.peekRecord('list', data.id)
@@ -1 +1 @@
-= table-number list.table.number
+= table-number list.table.table_number
@@ -5,7 +5,7 @@
      span.icon.needs-help
    if list.needs_payment
      span.icon.needs-payment
-  span.table-number= table-number list.table.number
+  span.table-number= table-number list.table.table_number
  = link-to 'section' list.table.section class="link-to-section"
    span=list.table.section.title
  span.currency=currency list.total
@@ -4,7 +4,7 @@
    if order.active
      span.active-order
  span.order-display= order.display
-  span.table-number= table-number order.list.table.number
+  span.table-number= table-number order.list.table.table_number
  = link-to 'section' order.list.table.section class="link-to-section"
    span=order.list.table.section.title
  span.currency=currency order.total
@@ -11,7 +11,7 @@ if list.closed_at
 if list.active
  .display-row
    .display-label=t 'models.section'
-    .display-field= list.table.section.title
+    .display-field= link-to "section" list.table.section: list.table.section.title
  .display-row
    .display-label=t 'models.table'
    .display-field
@@ -13,7 +13,7 @@ else
            span.boolean.needs-payment=boolean list.needs_payment
            span.timestamp.created_at= time list.created_at
            span.state= state 'list' list.state
-          span.table-number= table-number list.table.number
+          span.table-number= table-number list.table.table_number
          span.currency= currency list.price
    .row.list-row-total: .small-12.columns
      span.total-sentence= t 'lists.index.total_sentence'
@@ -47,7 +47,7 @@ else
              td.boolean.needs_help=boolean list.needs_help
              td.boolean.needs_payment=boolean list.needs_payment
              td.timestamp=time list.closed_at
-              td.table_number= list.table.number
+              td.table_number= list.table.table_number
              td.currency=currency list.price
              td.timestamp=time list.created_at
        tfoot
@@ -1,10 +1,10 @@
-h4=t 'modal.change_list_table.subtitle' current_table_number=model.table.number
+h4=t 'modal.change_list_table.subtitle' current_table_number=model.table.table_number
 = users-buttons users=model.users
 each sections as |section|
  h3= section.title
  ul.change-list-table-section-tables
    each section.sorted_tables as |table|
      unless table.active_list
-        li: a{action "moveToTable" table}= table-number table.number
+        li: a{action "moveToTable" table}= table-number table.table_number
 hr
 button.modal-close{action "close"}=t 'modal.change_list_table.close_button'
@@ -1,6 +1,6 @@
 p=t 'table.modal.body_header'
 .form-row.number
-  .form-label=t 'attributes.table.number'
+  .form-label=t 'attributes.table.table_number'
  .form-field= number-field numericValue=model.number
 .form-row.section
  .form-label=t 'models.section'
@@ -1,4 +1,4 @@
-.table-number= table.number
+.table-number= table.table_number
 unless section.editmode
  .status-icons
    span.needs_payment
@@ -6,7 +6,7 @@ unless section.editmode
    span.active_order
 if table.active_list
  div.table-actions
-    .title= table.number
+    .title= table.table_number
    if table.active_list
      .table-action-row
        /= view "mark-list-helped-button" tableBinding="table.active_list"
@@ -1,9 +1,9 @@
 .row: .small-12.columns
  h2.main-section-header=t 'models.table'
  .display-row
-    .display-label= t 'attributes.table.number'
+    .display-label= t 'attributes.table.table_number'
    .display-field
-      span= table.number
+      span= table.table_number
  if table.section
    .display-row
      .display-label=t 'models.section'
@@ -1,3 +1,3 @@
-.number= list.table.number
+.number= list.table.table_number
 .extra-list-info
  span.loading.medium
@@ -4,14 +4,14 @@
    table.table
      thead
        tr
-          th=t 'attributes.table.number'
+          th=t 'attributes.table.table_number'
          th.link=t 'models.section'
          /th.timestamp= t 'attributes.table.created_at'
          th.actions=t 'helpers.actions.title'
      tbody
        each tables as |table|
          tr
-            td= link-to 'table' table: span= table.number
+            td= link-to 'table' table: span= table.table_number
            td.link
              if table.section
                = link-to 'section' table.section