Yet better ember2 compliance
This commit is contained in:
@@ -1,7 +1,8 @@
|
|||||||
App.SuppliersSwitcherComponent = Ember.Component.extend
|
App.SuppliersSwitcherComponent = Ember.Component.extend
|
||||||
classNames: ['suppliers-switcher-container']
|
classNames: ['suppliers-switcher-container']
|
||||||
suppliers: (-> @get('targetObject.store').peekAll 'supplier').property()
|
suppliers: (-> @get('targetObject.store').peekAll 'supplier').property()
|
||||||
other_suppliers: ( -> @get('suppliers').rejectBy 'id', @get('globals.current_supplier.id')).property('suppliers.@each')
|
other_suppliers: Ember.computed 'suppliers.[]',
|
||||||
|
-> @get('suppliers').rejectBy 'id', @get('globals.current_supplier.id')
|
||||||
actions:
|
actions:
|
||||||
switchTo: (locale)->
|
switchTo: (locale)->
|
||||||
setLocale locale
|
setLocale locale
|
||||||
|
|||||||
@@ -22,12 +22,12 @@ App.IndexController = Ember.Controller.extend
|
|||||||
orders.sortBy('created_at') # Not reversed, oldest on top, start with oldest order first :-) Customer happyness
|
orders.sortBy('created_at') # Not reversed, oldest on top, start with oldest order first :-) Customer happyness
|
||||||
).property('orders.@each.state', 'active_section.id')
|
).property('orders.@each.state', 'active_section.id')
|
||||||
|
|
||||||
show_lists_table: Ember.computed 'show_lists', 'active_lists.@each', ->
|
show_lists_table: Ember.computed 'show_lists', 'active_lists.[]', ->
|
||||||
@get('show_lists') and @get('active_lists.length')
|
@get('show_lists') and @get('active_lists.length')
|
||||||
show_orders_table: Ember.computed 'show_orders', 'active_orders.@each', ->
|
show_orders_table: Ember.computed 'show_orders', 'active_orders.[]', ->
|
||||||
@get('show_orders') and @get('active_orders.length')
|
@get('show_orders') and @get('active_orders.length')
|
||||||
list_number_info: (-> " (#{@get('active_lists.length')})").property('active_lists.@each')
|
list_number_info: (-> " (#{@get('active_lists.length')})").property('active_lists.[]')
|
||||||
order_number_info: (-> " (#{@get('active_orders.length')})").property('active_orders.@each')
|
order_number_info: (-> " (#{@get('active_orders.length')})").property('active_orders.[]')
|
||||||
|
|
||||||
actions:
|
actions:
|
||||||
toggleDashboardLists: -> @set 'show_lists', !@get('show_lists')
|
toggleDashboardLists: -> @set 'show_lists', !@get('show_lists')
|
||||||
|
|||||||
@@ -17,4 +17,4 @@ App.ListsIndexController = Ember.Controller.extend
|
|||||||
|
|
||||||
sorted_lists: (->
|
sorted_lists: (->
|
||||||
@get('lists').sortBy('created_at').reverseObjects()
|
@get('lists').sortBy('created_at').reverseObjects()
|
||||||
).property('lists.@each')
|
).property('lists.[]')
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ App.MenuController = Ember.Controller.extend
|
|||||||
list = list.filter (r) -> r.get('full_day') or (filter_minute >= r.get('start_from') and filter_minute <= r.get('end_on'))
|
list = list.filter (r) -> r.get('full_day') or (filter_minute >= r.get('start_from') and filter_minute <= r.get('end_on'))
|
||||||
|
|
||||||
list.sortBy('position')
|
list.sortBy('position')
|
||||||
).property('product_categories.@each', 'product_categories.@each.position', 'filter.day', 'filter.minute_of_day')
|
).property('product_categories.[]', 'product_categories.@each.position', 'filter.day', 'filter.minute_of_day')
|
||||||
product_code_filter_placeholder: t('product.code_filter.placeholder')
|
product_code_filter_placeholder: t('product.code_filter.placeholder')
|
||||||
actions:
|
actions:
|
||||||
editProductCategory: (product_category)->
|
editProductCategory: (product_category)->
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ App.OrdersDisplayController = Ember.Controller.extend
|
|||||||
needs: ['application']
|
needs: ['application']
|
||||||
active_section: null
|
active_section: null
|
||||||
sections: (-> @store.all('section') ).property()
|
sections: (-> @store.all('section') ).property()
|
||||||
orders: Ember.computed 'model.@each', 'active_section.id', ->
|
orders: Ember.computed 'model.[]', 'active_section.id', ->
|
||||||
orders = @get('model').filterBy('needs_supplier_attention')
|
orders = @get('model').filterBy('needs_supplier_attention')
|
||||||
orders = orders.filterBy('section.id', id) if id = @get('active_section.id')
|
orders = orders.filterBy('section.id', id) if id = @get('active_section.id')
|
||||||
orders.sortBy('created_at') # Not reversed, oldest on top, start with oldest order first :-) Customer happyness
|
orders.sortBy('created_at') # Not reversed, oldest on top, start with oldest order first :-) Customer happyness
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ header.top-menu
|
|||||||
= t 'models.plural.employee'
|
= t 'models.plural.employee'
|
||||||
= link-to "schedule" class="top-menu-schedule"
|
= link-to "schedule" class="top-menu-schedule"
|
||||||
= t 'top_menu.schedule'
|
= t 'top_menu.schedule'
|
||||||
= dropdown-link gravatar=globals.current_employee.email classNames="current-employee-nav"
|
= dropdown-link gravatar=globals.current_employee.email class="current-employee-nav"
|
||||||
ul
|
ul
|
||||||
li
|
li
|
||||||
li= link-to 'my_account': span.current-employee-my-account-icon= t 'current_employee.my_account.link'
|
li= link-to 'my_account': span.current-employee-my-account-icon= t 'current_employee.my_account.link'
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.row: .small-12.columns: h2=t 'current_employee.my_account.title'
|
.row: .small-12.columns: h2=t 'current_employee.my_account.title'
|
||||||
.form-row
|
.form-row
|
||||||
.form-label: label=t 'attributes.employee.email'
|
.form-label: label=t 'attributes.employee.email'
|
||||||
.form-field= input value=globals.current_employee.email type="email" classNames="supplier-email" disabled=true
|
.form-field= input value=globals.current_employee.email type="email" class="supplier-email" disabled=true
|
||||||
.row: .small-12.columns= language-switcher
|
.row: .small-12.columns= language-switcher
|
||||||
.row: .small-12.columns= suppliers-switcher
|
.row: .small-12.columns= suppliers-switcher
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
.row: .small-12.columns: h2=t 'settings.title'
|
.row: .small-12.columns: h2=t 'settings.title'
|
||||||
.form-row
|
.form-row
|
||||||
.form-label: label=t 'attributes.supplier.name'
|
.form-label: label=t 'attributes.supplier.name'
|
||||||
.form-field= input value=supplier.name classNames="supplier-name"
|
.form-field= input type="text" value=supplier.name class="supplier-name"
|
||||||
.form-row
|
.form-row
|
||||||
.form-label: label=t 'attributes.supplier.email'
|
.form-label: label=t 'attributes.supplier.email'
|
||||||
.form-field= input value=supplier.email type="email" classNames="supplier-email"
|
.form-field= input value=supplier.email type="email" class="supplier-email"
|
||||||
/input.location_picker name="location" type="text" valueBinding="location"
|
/input.location_picker name="location" type="text" valueBinding="location"
|
||||||
/.form-row
|
/.form-row
|
||||||
.location_picker_map
|
.location_picker_map
|
||||||
|
|||||||
Reference in New Issue
Block a user