progress

app/assets/javascripts/user/app/components/lists/index-entry.js.coffee

@@ -3,5 +3,4 @@ App.ListIndexEntryComponent = Ember.Component.extend
   classNames: ['lists-overview-entry']
   classNameBindings: ['content.active:active']
   click: ->
-    debugger
-    @get('controller').transitionToRoute 'list', @get('list')
+    @get('targetObject').transitionToRoute 'list', @get('list')

app/assets/javascripts/user/app/controllers/lists_index_controller.js.coffee

@@ -1,2 +1,2 @@
-App.ListsIndexController = Ember.Controller.extend App.PaginationModule,
+App.ListsIndexController = Ember.Controller.extend #App.PaginationModule,
   lists: (->@get('model').sortBy('created_at').reverse()).property('model.[]')

app/assets/javascripts/user/app/controllers/table_controller.js.coffee

@@ -19,3 +19,4 @@ App.TableController = Ember.Controller.extend
       Ember.$.post("#{$data_host}/user/join_occupied_table.json", table_id: @get('model.id'))
       @set 'globals.join_request_sent', true # keeps the button deactivated
   #setupProductOrders: (-> @set('unordered_product_orders', @store.peekAll('product_order'))).on('init')
+  #openDebugger: Ember.computed 'model.id', (-> debugger; true)

app/assets/javascripts/user/app/manifest.js.coffee

@@ -3,7 +3,7 @@
 #= require handlebars
 #= require ember
 #= require ember-data
-#= require active-model-adapter
+# require active-model-adapter
 #= require_directory ./modifications
 #= require ./app
 #= require shared-ember-helpers/all

app/assets/javascripts/user/app/models/product.js.coffee

@@ -6,9 +6,11 @@ App.Product = DS.Model.extend
   position: attr('number', defaultValue: 0)
   active: attr 'boolean', defaultValue: true
   image: attr()
-  product_category: DS.belongsTo('product-category')
-  product_orders: DS.hasMany('product-order')
-  product_variants: DS.hasMany 'product-variant'
+
+  product_category: DS.belongsTo('product-category', async: false)
+  product_orders: DS.hasMany('product-order', async: false)
+  product_variants: DS.hasMany 'product-variant', async: false
+
   sorted_product_variants: Ember.computed 'product_variants.@each.name', 'product_variants.@each.position', ->
     @get('product_variants').sortBy('position')
 

app/assets/javascripts/user/app/models/product_category.js.coffee

@@ -1,8 +1,6 @@
 attr = DS.attr
 App.ProductCategory = DS.Model.extend
   name: attr('string')
-  products: DS.hasMany('product')
-  supplier: DS.belongsTo('supplier')
   active_on_sunday: attr('boolean', defaultValue: true)
   active_on_monday: attr('boolean', defaultValue: true)
   active_on_tuesday: attr('boolean', defaultValue: true)
@@ -13,7 +11,10 @@ App.ProductCategory = DS.Model.extend
   full_day: attr 'boolean', defaultValue: true
   start_from: attr('number')
   end_on: attr('number')
-  position: attr('number')
+  position: attr('number', defaultValue: 0)
   collapsed: attr('boolean', defaultValue: false)
 
+  products: DS.hasMany('product', async: false)
+  supplier: DS.belongsTo('supplier', async: false)
+
   sorted_products: (-> @get('products').sortBy('position') ).property('products.@each.position')

app/assets/javascripts/user/app/modifications/model_modifications.js.coffee

@@ -1,6 +1,6 @@
 DS.Model.reopen
-  #created_at: DS.attr('date')
-  #updated_at: DS.attr('date')
+  created_at: DS.attr('date')
+  updated_at: DS.attr('date')
   eraseRecord: ->
     #@clearRelationships()
     @transitionTo('deleted.saved')

app/assets/javascripts/user/app/routes/active_list_route.js.coffee

@@ -9,5 +9,3 @@ App.ActiveListRoute = Ember.Route.extend App.ResetScroll
       #@transitionTo 'table', table_id
     #else
       #controller.redirect_to 'index', message: 'the_list_has_been_closed'
-  #setupController: (controller, model)->
-    #debugger

app/assets/javascripts/user/app/routes/list_route.js.coffee

@@ -1,5 +1,5 @@
 App.ListRoute = Ember.Route.extend App.ResetScroll,
   model: (options)->
     @store.findRecord 'list', options.list_id
-  afterModel: (model)->
-    model.reload() unless model.is_extended_version()
+  #afterModel: (model)->
+  #  model.reload() unless model.is_extended_version()

app/assets/javascripts/user/app/routes/lists_route.js.coffee

@@ -1,5 +1,6 @@
-App.ListsRoute = Ember.Route.extend App.ResetScroll,
+App.ListsIndexRoute = Ember.Route.extend App.ResetScroll,
   model: ->
-    @store.findAll 'list'
+    @store.query('list', page: 1, per_page: 2)
   setupController: (controller, model)->
+    @_super(controller, model)
     controller.set('alreadyLoaded', true)

app/assets/javascripts/user/app/templates/global/_top_menu.emblem

@@ -6,7 +6,7 @@
           link-to 'index' class="top-menu-logo with-list"
             = image-tag 'user/logo-small.png'
           = menu-item route="active_list"
-          = menu-item route="table" route_param=globals.active_list.table.id
+          = menu-item route="table" route_param=globals.active_list.table
           = menu-item-list-needs-help
           = menu-item-list-needs-payment
         else

app/assets/javascripts/user/app/templates/lists/index-entry.emblem

@@ -1,3 +1,4 @@
 span.created_at=time list.created_at
 span.price.currency= currency list.price
+span.state= list.state
 span.name= list.supplier.name

app/assets/javascripts/user/app/templates/table.emblem

@@ -17,3 +17,5 @@
     .large-6.columns= new-product-orders-list table=model
   else
     .large12= menu-product-categories product_categories=model.supplier.product_categories orderProducts=false
+if openDebugger
+  span Debugger active