')
cont.append $('Waiting for approval of the person on this table
') - $.post('/user/join_occupied_table', {table_id: table_id}) + $.post(data_host + '/user/join_occupied_table', {table_id: table_id}) setInterval('Quser.check_if_can_join_occupied_table("'+table_id+'")', 7500) check_if_can_join_occupied_table: (table_id)-> - $.post('/user/check_table_join_status', {table_id: table_id}, (res) -> + $.post(data_host + '/user/check_table_join_status', {table_id: table_id}, (res) -> res ||= {} if res.approved redirect_to 'list_products' diff --git a/app/assets/stylesheets/_constants.css.sass b/app/assets/stylesheets/_constants.css.sass index be864f30..919522a7 100644 --- a/app/assets/stylesheets/_constants.css.sass +++ b/app/assets/stylesheets/_constants.css.sass @@ -1,3 +1,4 @@ $qbrown: #634227 +$qbrown-active: lighten($qbrown, 20%) $wood: image-url('textures/wood001-vertical.jpg') $background-brown: #57351f diff --git a/app/assets/stylesheets/supplier/section_tables.css.sass b/app/assets/stylesheets/supplier/section_tables.css.sass index a94e368b..c7c91bd1 100644 --- a/app/assets/stylesheets/supplier/section_tables.css.sass +++ b/app/assets/stylesheets/supplier/section_tables.css.sass @@ -1,9 +1,10 @@ +$table-width: 75px .section-tables-container .section-table background-color: #ccc height: 44px background-repeat: no-repeat - width: 45px + width: $table-width color: black a color: black @@ -33,7 +34,9 @@ &.needs_help background-color: #7f7 &.needs_payment - background-color: #f77 + background-image: image-url('icons/needs-payment.png') + background-position: 40px 2px + //background-color: #f77 a &:hover text-decoration: none @@ -43,3 +46,11 @@ margin-bottom: 30px float: left margin-right: 30px +// INDEX + +table + td + &.table-info + .table-count + &:after + content: " - " diff --git a/app/assets/stylesheets/user/structure.css.sass b/app/assets/stylesheets/user/structure.css.sass index c25c3724..7ae7fe3a 100644 --- a/app/assets/stylesheets/user/structure.css.sass +++ b/app/assets/stylesheets/user/structure.css.sass @@ -1,7 +1,24 @@ @import compass @import constants $side-spacing: 5px - +=user-button + cursor: pointer + border: 2px solid black + +border-radius(4px) + +box-shadow(#000 4px 4px 8px) + width: 34px + height: 34px + display: block + float: left + margin-left: 15px + background-color: $qbrown + text-align: center + line-height: 34px + background-repeat: no-repeat + background-position: center center + text-indent: -5000px + &.active + background-color: $qbrown-active html background-image: $wood @@ -42,20 +59,7 @@ body background-color: green width: 262px a - display: block - border: 2px solid black - +border-radius(4px) - +box-shadow(#000 4px 4px 8px) - width: 34px - height: 34px - float: left - margin-left: 15px - background-color: $qbrown - text-align: center - line-height: 34px - background-repeat: no-repeat - background-position: center center - text-indent: -5000px + +user-button &.home-list-link background-image: image-url('icons/list.png') &.home-menu-link @@ -91,3 +95,13 @@ body margin-left: 5px i padding-left: 5px +.user-top-button + +user-button + &#show-active-list + background-image: image-url('icons/list.png') + &#place-order-on-list + background-image: image-url('icons/menu.png') + &#list-needs-payment-button + background-image: image-url('icons/needs-payment.png') + &#list-needs-help-button + background-image: image-url('icons/needs-help.png') diff --git a/app/controllers/suppliers/sections_controller.rb b/app/controllers/suppliers/sections_controller.rb index 863e5960..77060587 100644 --- a/app/controllers/suppliers/sections_controller.rb +++ b/app/controllers/suppliers/sections_controller.rb @@ -5,6 +5,9 @@ module Suppliers # GET /sections.json def index @sections = current_supplier.sections + @sections.include_relation(:table) + @active_lists = current_supplier.active_lists + @active_table_ids = @active_lists.map(&:table_id).compact respond_to do |format| format.html # index.html.erb diff --git a/app/models/list.rb b/app/models/list.rb index efc143b7..8d48925d 100644 --- a/app/models/list.rb +++ b/app/models/list.rb @@ -20,12 +20,18 @@ class List view :by_supplier_id_and_id, key: [:supplier_id, :_id] - view :active_by_table_id, type: :custom, map_function: %|function(doc){ + view :active_by_table_id_view, type: :custom, map_function: %|function(doc){ if(doc.ruby_class == 'List' && doc.state == 'active'){ emit(doc.table_id, 1); } }|, reduce_function: '_sum' + view :active_by_supplier_id_view, type: :custom, map_function: %|function(doc){ + if(doc.ruby_class == 'List' && doc.state == 'active'){ + emit(doc.supplier_id, 1); + } + }|, reduce_function: '_sum' + view :active_by_section_id_view, type: :custom, map_function: %|function(doc){ if(doc.ruby_class == 'List' && doc.state == 'active' && doc.section_id){ emit(doc.section_id, 1); @@ -40,6 +46,10 @@ class List } }|, reduce_function: '_sum' + def self.active + database.view(active_by_supplier_id_view(reduce: false, include_docs: true)) + end + # Create, a list given a table and a user def self.from_table table, user return if user.has_active_list? @@ -51,10 +61,18 @@ class List list end + def self.active_for_supplier(supplier_id, options = {}) + database.view(active_by_supplier_id_view(key: supplier_id, reduce: false, include_docs: true)) + end + def self.active_for_section(section_id, options = {}) database.view(active_by_section_id_view(key: section_id, reduce: false, include_docs: true)) end + def self.active_for_table(table_id, options = {}) + database.view(active_by_table_id_view(options.reverse_merge(key: table_id, reduce: false, include_docs: true))) + end + def self.for_user(user, options = {}) with_pagination_options(options) do |options| database.view(for_user_view({startkey: ["#{user.id}\u9999"], endkey: [user.id], include_docs: true, reduce: false, descending: true}.merge(options))) diff --git a/app/models/supplier.rb b/app/models/supplier.rb index 2d05db7f..9423a543 100644 --- a/app/models/supplier.rb +++ b/app/models/supplier.rb @@ -33,11 +33,10 @@ class Supplier end def active_lists(options = {}) - return @active_lists if @active_lists - @tables ||= active_tables(options) - @tables.include_relation(:lists) - @active_lists = @tables.map(&:lists).flatten.select(&:active?) + return @active_lists if @active_lists.present? + @active_lists = List.active_for_supplier(id) @active_lists.include_relations(table: :section, orders: {product_orders: :product}) + @active_lists end diff --git a/app/models/table.rb b/app/models/table.rb index 8a7a4fe4..13eba074 100644 --- a/app/models/table.rb +++ b/app/models/table.rb @@ -18,11 +18,11 @@ class Table def occupied? return @is_occupied if instance_variable_defined?(:'@is_occupied') - @is_occupied = !self.class.database.view(List.active_by_table_id(key: id, reduce: true)).zero? + @is_occupied = !self.class.database.view(List.active_by_table_id_view(key: id, reduce: true)).zero? end def active_list - @active_list ||= self.class.database.view(List.active_by_table_id(key: id, include_docs: true, reduce: false, limit: 1)).try(:first) + @active_list ||= self.class.database.view(List.active_by_table_id_view(key: id, include_docs: true, reduce: false, limit: 1)).try(:first) end def reserved? diff --git a/app/views/layouts/phone.html.slim b/app/views/layouts/phone.html.slim index b4a27607..c7336ee4 100644 --- a/app/views/layouts/phone.html.slim +++ b/app/views/layouts/phone.html.slim @@ -58,3 +58,7 @@ html lang="en" /! Placed at the end of the document so the pages load faster = javascript_include_tag "user/application" = yield :footer + javascript: + $(function(){ + $('[data-t]').each(function(){$(this).text(t($(this).attr('data-t')))}) + }); diff --git a/app/views/suppliers/sections/index.html.slim b/app/views/suppliers/sections/index.html.slim index ecf4f15f..d45bdd9e 100644 --- a/app/views/suppliers/sections/index.html.slim +++ b/app/views/suppliers/sections/index.html.slim @@ -6,6 +6,7 @@ thead tr th.link= model_class.human_attribute_name(:title) + th.table-info= Table.model_name.human_plural th.numeric= model_class.human_attribute_name(:width) th.numeric= model_class.human_attribute_name(:height) th.timestamp= model_class.human_attribute_name(:created_at) @@ -14,10 +15,15 @@ - @sections.each do |section| tr td.link= link_to section.title, [:suppliers, section] + td.table-info + span.table-count= section.tables.size + span.active-table-count= (@active_table_ids & section.tables.map(&:id)).size td.numeric= section.width td.numeric= section.height td.timestamp=l section.created_at, format: :short td.actions + = link_to t('supplier.section.tables_view'), [:tables_view, :suppliers, section], class: [:btn, 'btn-mini btn-info'] + ' = link_to t('helpers.links.edit'), [:edit, :suppliers, section], class: 'btn btn-mini' ' = link_to t("helpers.links.destroy"), [:suppliers, section], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-mini btn-danger' diff --git a/app/views/user/active_list.html.slim b/app/views/user/active_list.html.slim index 2143c993..d546f347 100644 --- a/app/views/user/active_list.html.slim +++ b/app/views/user/active_list.html.slim @@ -3,9 +3,9 @@ .supplier-name h4= t('user.active_list.title', list: List.model_name.human) .form-actions - = link_to t('helpers.links.place_order'), user_list_products_path, class: ['btn btn-primary'] - span#list-needs-payment-button - span#list-needs-help-button + = link_to t('helpers.links.place_order'), user_list_products_path, class: ['user-top-button'], id: 'place-order-on-list' + span#list-needs-payment-button.user-top-button + span#list-needs-help-button.user-top-button .well table#active-list-table.table thead diff --git a/app/views/user/list_products.html.slim b/app/views/user/list_products.html.slim index 4c5d5f36..22f0c22b 100644 --- a/app/views/user/list_products.html.slim +++ b/app/views/user/list_products.html.slim @@ -3,8 +3,9 @@ .supplier-name h4= t('user.show_products.title', products: Product.model_name.human_plural) .form-actions - = link_to t('helpers.links.show_active_list', list: List.model_name.human), user_active_list_path, class: ['btn btn'] - span#list-needs-help-button + = link_to t('helpers.links.show_active_list', list: List.model_name.human), user_active_list_path, class: ['user-top-button'], id: 'show-active-list' + span#list-needs-payment-button.user-top-button + span#list-needs-help-button.user-top-button .well table#products-table.table tbody @@ -21,9 +22,9 @@ tfoot tr td colspan=2 - button class="btn btn-primary" onClick="Quser.handle_active_list(function(){Quser.order_selected_products()})" Bestellen + button class="btn btn-primary" onClick="Quser.handle_active_list(function(){Quser.order_selected_products()})" data-t="selected_products.order"= t('selected_products.order') | - button class="btn btn btn-warning" onClick="Quser.clear_selected_products()" Clear + button class="btn btn btn-warning" onClick="Quser.clear_selected_products()" data-t="selected_products.clear"= t('selected_products.clear') td.currency strong#active-order-total td diff --git a/config/locales/en.yml b/config/locales/en.yml index 4a88d09d..0effb3cf 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -110,3 +110,7 @@ en: boolean: boolean_yes: "Yes" boolean_no: "No" +# FOLLOWING ARE BACKED BY DATA ATTRIBUTES + selected_products: + clear: Clear + order: Order