bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spec squashing

Browse Source
This commit is contained in:
Benjamin ter Kuile
2015-09-21 18:25:37 +02:00
parent 61dba311fa
commit ee199d7da8
18 changed files with 82 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/supplier/app/components/dashboard/active-order.js.coffee
+1 -1
View File
@@ -1,5 +1,5 @@
App.DashboardActiveOrderComponent = Ember.Component.extend
tagName: 'tr'
layoutName: 'dashboard/active-order'
classNameBindings: ['content.active:active', 'content.delivered:delivered', 'classIdentifier']
classNameBindings: ['order.active:active', 'order.delivered:delivered', 'classIdentifier']
classIdentifier: Ember.computed 'order.id', -> "order-row-#{@get('order.id')}"
app/assets/javascripts/supplier/app/components/form/my-select.js.coffee
+8 -1
View File
@@ -17,6 +17,13 @@ App.MySelectComponent = Ember.Component.extend
@set('content', []) unless @get('content')
).on('init')
didRender: ->
# Set select to current value if can be found
key = @get('optionValuePath')
index = @get('content').mapBy(key).indexOf(@get("selection.#{key}"))
if index > -1
@$('select:first').prop('selectedIndex', index)
actions:
change: ->
selectedIndex = @$('select:first').get(0).selectedIndex
@@ -25,7 +32,7 @@ App.MySelectComponent = Ember.Component.extend
hasPrompt = !!@get('prompt')
contentIndex = if hasPrompt then selectedIndex - 1 else selectedIndex
selection = @get('content')[contentIndex]
selection = @get('content').toArray()[contentIndex]
# set the local, shadowed selection to avoid leaking
# changes to `selection` out via 2-way binding
app/assets/javascripts/supplier/app/controllers/employees.js.coffee
+3
View File
@@ -0,0 +1,3 @@
App.EmployeesController = Ember.Controller.extend
employeeSorting: ['name']
employees: Ember.computed.sort 'model', 'employeeSorting'
app/assets/javascripts/supplier/app/controllers/employees_index_controller.js.coffee
-2
View File
@@ -1,2 +0,0 @@
App.EmployeesIndexController = Ember.Controller.extend
employees: (-> @get('model').sortBy('name')).property('model.@each.name')
app/assets/javascripts/supplier/app/controllers/modals/table_edit_controller.js.coffee
-5
View File
@@ -3,10 +3,5 @@ App.modals.TableEditController = App.modals.BaseController.extend
sections: (-> @store.peekAll('section')).property()
#setSelectedSection: (-> @set 'selectedSection', @get('model.section')).on('init')
actions:
confirm: ->
@get('model').then (l)->l.close()
@send 'closeModal'
saveTable: ->
#@set 'model.section', @get('selectedSection')
@set 'model.section', @get('model.section')
@send 'save'
app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee
+2 -1
View File
@@ -2,7 +2,8 @@ App.TablesIndexController = Ember.Controller.extend
tables: (-> @get('model').sortBy('casted_number')).property('model.@each.number')
actions:
newTable: ->
table = @store.createRecord('table')
section = @get('globals.active_section') || @store.peekAll('section').toArray()[0]
table = @store.createRecord('table', section: section)
@modal 'table_edit',
model: table
close: -> table.deleteRecord()
app/assets/javascripts/supplier/app/mixins/employee-actions-mixin.js.coffee
+22
View File
@@ -0,0 +1,22 @@
App.EmployeeActionsMixin = Ember.Mixin.create
actions:
newEmployee: ->
employee = @store.createRecord('employee')
@get('controller').modal 'employee_edit',
model: employee
title_path: 'employee.modal.new_title'
close: -> employee.deleteRecord()
editEmployee: (employee)->
@get('controller').modal 'employee_edit',
model: employee
title_path: 'employee.modal.edit_title'
close: -> employee.rollbackAttributes()
destroyEmployee: (employee)->
ac = @controllerFor('application')
if @get('globals.current_employee.id') isnt employee.id
ac.modal 'confirm',
title: t('employee.destroy.modal.title', employee.toJSON())
ok: -> employee.destroyRecord()
else
ac.modal 'alert',
title: 'You cannot remove yourself'
app/assets/javascripts/supplier/app/router.js.coffee
+2 -2
View File
@@ -12,8 +12,8 @@ App.Router.map ->
@resource 'table', path: ':table_id'
@resource 'lists', ->
@resource 'list', path: ':list_id'
@resource 'employees', ->
@resource 'employee', path: ':employee_id'
@route 'employees'
@route 'employee', path: '/employees/:employee_id'
@resource 'pages', ->
@resource 'page', path: ':page_id'
@route 'orders_display' # chromecast etc
app/assets/javascripts/supplier/app/routes/employee.js.coffee
+1
View File
@@ -0,0 +1 @@
App.EmployeeRoute = Ember.Route.extend App.EmployeeActionsMixin
app/assets/javascripts/supplier/app/routes/employees.js.coffee
+2 -23
View File
@@ -1,23 +1,2 @@
App.EmployeesRoute = Ember.Route.extend
model: -> @store.peekAll 'employee'
actions:
newEmployee: ->
employee = @store.createRecord('employee')
@get('controller').modal 'employee_edit',
model: employee
title_path: 'employee.modal.new_title'
close: -> employee.deleteRecord()
editEmployee: (employee)->
@get('controller').modal 'employee_edit',
model: employee
title_path: 'employee.modal.edit_title'
close: -> employee.rollbackAttributes()
destroyEmployee: (employee)->
ac = @controllerFor('application')
if ac.get('employee.id') isnt employee.id
ac.modal 'confirm',
title: t('employee.destroy.modal.title', employee.toJSON())
ok: -> employee.destroyRecord()
else
ac.modal 'alert',
title: 'You cannot remove yourself'
App.EmployeesRoute = Ember.Route.extend App.EmployeeActionsMixin,
model: -> @store.findAll 'employee'
app/assets/javascripts/supplier/app/templates/employees.emblem
+29 -1
View File
@@ -1 +1,29 @@
= outlet
.row: .small-12.columns
h2.main-section-header=t 'models.plural.employee'
if employees
table.table
thead
tr
th.name=t 'attributes.employee.name'
th.email=t 'attributes.employee.email'
th.boolean= t 'attributes.employee.manager'
th.boolean= t 'attributes.employee.active'
th.colorbox= t 'attributes.employee.color'
th.actions=t 'helpers.actions.title'
tbody
each employees as |employee|
tr
td: link-to 'employee' employee: span= employee.name
td.email
= employee.email
= errors employee.errors.email
td.boolean= boolean employee.manager
td.boolean= boolean employee.active
td.colorbox= colorbox employee.color
td.actions
if (can "manage" "employees")
a.table-edit{ action 'editEmployee' employee }: span
a.table-destroy{ action 'destroyEmployee' employee }: span
.form-actions
if (can "manage" "employees")
a.form-action-new.new-employee-button{action "newEmployee"}= t 'employee.new_button'
app/assets/javascripts/supplier/app/templates/employees/index.emblem
-29
View File
@@ -1,29 +0,0 @@
.row: .small-12.columns
h2.main-section-header=t 'models.plural.employee'
if employees
table.table
thead
tr
th.name=t 'attributes.employee.name'
th.email=t 'attributes.employee.email'
th.boolean= t 'attributes.employee.manager'
th.boolean= t 'attributes.employee.active'
th.colorbox= t 'attributes.employee.color'
th.actions=t 'helpers.actions.title'
tbody
each employees as |employee|
tr
td: link-to 'employee' employee: span= employee.name
td.email
= employee.email
= errors employee.errors.email
td.boolean= boolean employee.manager
td.boolean= boolean employee.active
td.colorbox= colorbox employee.color
td.actions
if (can "manage" "sections")
a.table-edit{ action 'editEmployee' employee }: span
a.table-destroy{ action 'destroyEmployee' employee }: span
.form-actions
if (can "manage" "employees")
a.form-action-new.new-employee-button{action "newEmployee"}= t 'employee.new_button'
app/assets/javascripts/supplier/app/templates/modals/table_edit.emblem
+1 -1
View File
@@ -13,5 +13,5 @@ p=t 'table.modal.body_header'
.form-field= number-field numericValue=model.height
hr
button.modal-close{action "close"}=t 'table.modal.close_button'
button.modal-confirm.right{action "save"}=t 'table.modal.save_button'
button.modal-confirm.right{action "saveTable"}=t 'table.modal.save_button'
= qr-codes-link table=model