From 2d0e656c966e6484fb8e9340a224a9db744d67dc Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Tue, 29 Jul 2014 20:25:42 +0200 Subject: [PATCH] Request cleanup --- .../app/controllers/application_controller.js.coffee | 2 +- .../supplier/app/routes/application_route.js.coffee | 6 ++++++ .../javascripts/supplier/app/routes/index_route.js.coffee | 2 +- .../supplier/app/routes/sections_route.js.coffee | 2 +- .../javascripts/supplier/foundation1/qsupplier.js.coffee | 2 +- app/views/layouts/tablet.html.slim | 2 -- app/views/suppliers/application/_head.html.erb | 7 ++++--- bin/build_mobile_app.rb | 1 + make_mobile | 8 ++++++++ wip.md | 3 ++- 10 files changed, 25 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee index 67a55878..add28b63 100644 --- a/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee @@ -13,4 +13,4 @@ Qsupplier.App.ApplicationController = Ember.Controller.extend #error_supplier.eraseRecord() #@set 'supplier', null #@store.find('supplier', 'current').then success, error - @set 'supplier', @store.find('supplier', supplier_id) + # @set 'supplier', @store.find('supplier', supplier_id) diff --git a/app/assets/javascripts/supplier/app/routes/application_route.js.coffee b/app/assets/javascripts/supplier/app/routes/application_route.js.coffee index ac844a05..29b9f2cd 100644 --- a/app/assets/javascripts/supplier/app/routes/application_route.js.coffee +++ b/app/assets/javascripts/supplier/app/routes/application_route.js.coffee @@ -4,7 +4,13 @@ Qsupplier.App.ApplicationRoute = Ember.Route.extend @store.find 'product_category' #@store.find 'order', state: 'active' included in list setupController: (controller)-> + # @set 'supplier', @store.find('supplier', supplier_id) + supplier = @store.push 'supplier', supplier_object + controller.set 'supplier', supplier + @store.find 'list', state: 'active' + @store.find 'section' + controller.set 'product_categories', @store.all('product_category') actions: openModal: (modalName, model)-> diff --git a/app/assets/javascripts/supplier/app/routes/index_route.js.coffee b/app/assets/javascripts/supplier/app/routes/index_route.js.coffee index 55911bf2..6c56f5ed 100644 --- a/app/assets/javascripts/supplier/app/routes/index_route.js.coffee +++ b/app/assets/javascripts/supplier/app/routes/index_route.js.coffee @@ -11,7 +11,7 @@ Qsupplier.App.IndexRoute = Ember.Route.extend # mayby @store.all 'list' will work better!!!! (2014-04-24 a more experienced benjamin :) #orders: @store.filter 'order', -> true orders: @store.all 'order' - sections: @store.find 'section' + sections: @store.all 'section' setupController: (controller, model)-> controller.set('model', model) #$('#section_selector').on 'change', (-> controller.set('sectionId', $(this).val())) diff --git a/app/assets/javascripts/supplier/app/routes/sections_route.js.coffee b/app/assets/javascripts/supplier/app/routes/sections_route.js.coffee index 9d51ed3d..56d64314 100644 --- a/app/assets/javascripts/supplier/app/routes/sections_route.js.coffee +++ b/app/assets/javascripts/supplier/app/routes/sections_route.js.coffee @@ -1,5 +1,5 @@ Qsupplier.App.SectionsRoute = Ember.Route.extend - model: -> @store.find 'section' + model: -> @store.all 'section' setupController: (controller, collection) -> controller.set 'content', collection diff --git a/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee b/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee index 216df945..45d57e65 100644 --- a/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee +++ b/app/assets/javascripts/supplier/foundation1/qsupplier.js.coffee @@ -2,7 +2,7 @@ root = exports ? this root.Qsupplier= watch_events: -> faye = new Faye.Client(event_host) - faye.subscribe "/supplier/#{supplier_id}", (e)=> + faye.subscribe "/supplier/#{supplier_object.id}", (e)=> console.log "Event: #{e.event}" console.log e.data if(e.event == 'new_order') diff --git a/app/views/layouts/tablet.html.slim b/app/views/layouts/tablet.html.slim index b1d2b892..f066cbb5 100644 --- a/app/views/layouts/tablet.html.slim +++ b/app/views/layouts/tablet.html.slim @@ -16,8 +16,6 @@ html lang="en" = javascript_include_tag "supplier/foundation1/application" = yield :head /= javascript_include_tag "https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&libraries=places&language=#{I18n.locale}" - javascript: - supplier_id="#{current_supplier.id}"; body = render 'suppliers/application/top_menu' diff --git a/app/views/suppliers/application/_head.html.erb b/app/views/suppliers/application/_head.html.erb index bbc5da85..e3bcdb5a 100644 --- a/app/views/suppliers/application/_head.html.erb +++ b/app/views/suppliers/application/_head.html.erb @@ -1,7 +1,8 @@ diff --git a/bin/build_mobile_app.rb b/bin/build_mobile_app.rb index 722d5fcb..c58019ee 100644 --- a/bin/build_mobile_app.rb +++ b/bin/build_mobile_app.rb @@ -69,6 +69,7 @@ class << uc end uc.instance_variable_set('@_request', uc.request) for action in uc.action_methods + next unless action == 'index' if File.exist?(Rails.root.join('app', 'views', 'user', "#{action}.html.slim")) puts "action #{action} found" result = uc.render_to_string(action: action.dup) diff --git a/make_mobile b/make_mobile index 5c1d73ad..b201ad40 100755 --- a/make_mobile +++ b/make_mobile @@ -1,4 +1,12 @@ #!/usr/bin/env bash rm -rf public/assets; QWAITER_MOBILE_EXPORT=yes RAILS_ENV=production bundle exec rake assets:precompile; +rm -rf public/assets/cmtool; +rm -rf public/assets/jquery-ui; +rm -rf public/assets/admin; +rm -rf public/assets/waiter; +rm -rf public/assets/supplier; +rm -rf public/assets/site; +rm -rf public/assets/cartoon; +rm -rf public/assets/frames; QWAITER_MOBILE_EXPORT=yes RAILS_ENV=production TEST_HOST=$1 bundle exec rails runner bin/build_mobile_app.rb; diff --git a/wip.md b/wip.md index 2a144612..4e26030b 100644 --- a/wip.md +++ b/wip.md @@ -33,6 +33,7 @@ Supplier User ---- +- Cleanup UserController - Add product info (look at waiter app) - translate join table strings - Add order plus button @@ -60,4 +61,4 @@ Bugs Post release ============ -Chromecast app Waiter app Users can disable their own help request (maak ongedaan?) Users can disable their own bill request (maak ongedaan?) Think about extra confirmation box for these requests Supplier section 100% on ember :) +- Chromecast app Waiter app Users can disable their own help request (maak ongedaan?) Users can disable their own bill request (maak ongedaan?) Think about extra confirmation box for these requests Supplier section 100% on ember :)