Broken end of day commit

This commit is contained in:
2014-08-06 18:46:36 +02:00
parent 1d4fdc42d9
commit e61767fe78
11 changed files with 25 additions and 24 deletions
+12 -12
View File
@@ -87,8 +87,8 @@ GEM
i18n i18n
rake (>= 10.0.0) rake (>= 10.0.0)
sshkit (~> 1.3) sshkit (~> 1.3)
capistrano-bundler (1.1.2) capistrano-bundler (1.1.3)
capistrano (~> 3.0) capistrano (~> 3.1)
sshkit (~> 1.2) sshkit (~> 1.2)
capistrano-rails (1.1.1) capistrano-rails (1.1.1)
capistrano (~> 3.1) capistrano (~> 3.1)
@@ -183,7 +183,7 @@ GEM
websocket-driver (>= 0.3.1) websocket-driver (>= 0.3.1)
font-awesome-rails (4.1.0.0) font-awesome-rails (4.1.0.0)
railties (>= 3.2, < 5.0) railties (>= 3.2, < 5.0)
foundation-rails (5.3.1.0) foundation-rails (5.3.3.0)
railties (>= 3.1.0) railties (>= 3.1.0)
sass (>= 3.2.0) sass (>= 3.2.0)
fuubar (1.3.3) fuubar (1.3.3)
@@ -203,7 +203,7 @@ GEM
hike (1.2.3) hike (1.2.3)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (0.6.11) i18n (0.6.11)
iso_country_codes (0.4.3) iso_country_codes (0.4.4)
jquery-rails (3.1.1) jquery-rails (3.1.1)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
@@ -226,7 +226,7 @@ GEM
treetop (~> 1.4.8) treetop (~> 1.4.8)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (1.25.1)
mini_magick (3.7.0) mini_magick (3.8.0)
subexec (~> 0.2.1) subexec (~> 0.2.1)
mini_portile (0.6.0) mini_portile (0.6.0)
minitest (5.4.0) minitest (5.4.0)
@@ -236,7 +236,7 @@ GEM
net-scp (1.2.1) net-scp (1.2.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.9.1) net-ssh (2.9.1)
nokogiri (1.6.3) nokogiri (1.6.3.1)
mini_portile (= 0.6.0) mini_portile (= 0.6.0)
oauth2 (1.0.0) oauth2 (1.0.0)
faraday (>= 0.8, < 0.10) faraday (>= 0.8, < 0.10)
@@ -299,17 +299,17 @@ GEM
rspec-core (~> 3.0.0) rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0) rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0) rspec-mocks (~> 3.0.0)
rspec-core (3.0.2) rspec-core (3.0.3)
rspec-support (~> 3.0.0) rspec-support (~> 3.0.0)
rspec-expectations (3.0.2) rspec-expectations (3.0.3)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0) rspec-support (~> 3.0.0)
rspec-its (1.0.1) rspec-its (1.0.1)
rspec-core (>= 2.99.0.beta1) rspec-core (>= 2.99.0.beta1)
rspec-expectations (>= 2.99.0.beta1) rspec-expectations (>= 2.99.0.beta1)
rspec-mocks (3.0.2) rspec-mocks (3.0.3)
rspec-support (~> 3.0.0) rspec-support (~> 3.0.0)
rspec-rails (3.0.1) rspec-rails (3.0.2)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
@@ -317,7 +317,7 @@ GEM
rspec-expectations (~> 3.0.0) rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0) rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0) rspec-support (~> 3.0.0)
rspec-support (3.0.2) rspec-support (3.0.3)
ruby-progressbar (1.5.1) ruby-progressbar (1.5.1)
sass (3.2.19) sass (3.2.19)
sass-rails (4.0.3) sass-rails (4.0.3)
@@ -367,7 +367,7 @@ GEM
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
tinymce-rails (4.1.2) tinymce-rails (4.1.3)
railties (>= 3.1.1) railties (>= 3.1.1)
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
+2 -1
View File
@@ -1,4 +1,5 @@
#web: bundle exec thin start -p $PORT #web: bundle exec thin start -p $PORT
faye: thin start -R faye/config.ru -p 9296 faye: thin start -R faye/config.ru -p 9296
#faye: rackup faye.ru -s thin -E production #faye: rackup faye.ru -s thin -E production
counters: bin/drb_counter.rb start counters: bin/drb_counter.rb run
database: echo "BuenosAires" | sudo -S couchdb start | ~/bin/couch_output
@@ -4,7 +4,7 @@ Qsupplier.App.List = DS.Model.extend
needs_help: attr 'boolean' needs_help: attr 'boolean'
needs_payment: attr 'boolean' needs_payment: attr 'boolean'
user_requests_closing: attr('boolean') user_requests_closing: attr('boolean')
users: DS.hasMany('user') users: DS.hasMany('user', async: true)
is_paid: attr 'boolean' is_paid: attr 'boolean'
#has_active_orders: attr 'boolean' #has_active_orders: attr 'boolean'
@@ -1,7 +1,7 @@
# For more information see: http://emberjs.com/guides/routing/ # For more information see: http://emberjs.com/guides/routing/
# and for queryParams: https://github.com/alexspeller/website/blob/a96d9afe4506454b155cc64299e86e558ce3c9f1/source/guides/routing/query-params.md # and for queryParams: https://github.com/alexspeller/website/blob/a96d9afe4506454b155cc64299e86e558ce3c9f1/source/guides/routing/query-params.md
Qsupplier.App.Router.reopen Qsupplier.App.Router.reopen
location: 'history' # location: 'history'
rootURL: '/supplier' rootURL: '/supplier'
Qsupplier.App.Router.map -> Qsupplier.App.Router.map ->
@@ -1,5 +1,5 @@
Qsupplier.App.SectionsRoute = Ember.Route.extend Qsupplier.App.SectionsRoute = Ember.Route.extend
model: -> @store.all 'section' model: -> @store.all 'section'
setupController: (controller, collection) -> # setupController: (controller, collection) ->
controller.set 'content', collection # controller.set 'content', collection
@@ -8,7 +8,7 @@ td.status-icons
| |
span.icon.needs-payment span.icon.needs-payment
td.numeric.table_number: Qsupplier.App.TableNumberWithInfoView contextBinding="view.content" td.numeric.table_number: Qsupplier.App.TableNumberWithInfoView contextBinding="view.content"
td.section_title {{view.content.section.title}} td.section_title: link-to 'section' view.content.section.id: span=view.content.section.title
td.currency.total_list_amount {{currency view.content.total}} td.currency.total_list_amount {{currency view.content.total}}
td.actions td.actions
/ if view.content.needs_help / if view.content.needs_help
@@ -5,7 +5,7 @@ td.status-icons
span.active-order.fa.fa-check.fa-lg span.active-order.fa.fa-check.fa-lg
td= view.content.display td= view.content.display
td.numeric.table_number: Qsupplier.App.TableNumberWithInfoView contextBinding="view.content.list" td.numeric.table_number: Qsupplier.App.TableNumberWithInfoView contextBinding="view.content.list"
td.section_title= view.content.list.section.title td.section_title: link-to 'section' view.content.list.section.id: span=view.content.list.section.title
td.currency=currency view.content.total td.currency=currency view.content.total
td.actions td.actions
if view.content.placed if view.content.placed
@@ -16,7 +16,6 @@ module Suppliers
end end
end end
respond_to do |format| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.json { render json: @sections, each_serializer: SupplierExtendedSectionSerializer } format.json { render json: @sections, each_serializer: SupplierExtendedSectionSerializer }
+1 -1
View File
@@ -47,7 +47,7 @@ module ApplicationHelper
end end
def application_title def application_title
'Qwaiter' 'mozo.bar'
end end
# Helper for displaying HTML currency values # Helper for displaying HTML currency values
@@ -7,7 +7,7 @@ step "I visit the supplier root path" do
end end
step "I visit the supplier section path" do step "I visit the supplier section path" do
visit "/supplier/sections/#{@section.id}" visit "/supplier#/sections/#{@section.id}"
end end
step "I visit the supplier last section path" do step "I visit the supplier last section path" do
@@ -27,6 +27,7 @@ step "the section table should be marked as in need of help" do
end end
step "the section table should not be marked as in need of help" do step "the section table should not be marked as in need of help" do
binding.pry
table = page.find(".section-table-#{@table.id}") table = page.find(".section-table-#{@table.id}")
table['class'].should_not include 'needs_help' table['class'].should_not include 'needs_help'
end end