diff --git a/app/assets/javascripts/controllers/events.coffee.erb b/app/assets/javascripts/controllers/events.coffee.erb index d5269f908..81f88466d 100644 --- a/app/assets/javascripts/controllers/events.coffee.erb +++ b/app/assets/javascripts/controllers/events.coffee.erb @@ -1,13 +1,7 @@ 'use strict' -Application.Controllers.controller "EventsController", ["$scope", "$state", 'Event', ($scope, $state, Event) -> - - - - ### PRIVATE STATIC CONSTANTS ### - - # Number of events added to the page when the user clicks on 'load next events' - EVENTS_PER_PAGE = 12 +Application.Controllers.controller "EventsController", ["$scope", "$state", 'Event', 'categoriesPromise', 'themesPromise', 'ageRangesPromise' +, ($scope, $state, Event, categoriesPromise, themesPromise, ageRangesPromise) -> @@ -16,33 +10,37 @@ Application.Controllers.controller "EventsController", ["$scope", "$state", 'Eve ## The events displayed on the page $scope.events = [] - ## By default, the pagination mode is activated to limit the page size - $scope.paginateActive = true - ## The currently displayed page number $scope.page = 1 + ## List of categories for the events + $scope.categories = categoriesPromise + + ## List of events themes + $scope.themes = themesPromise + + ## List of age ranges + $scope.ageRanges = ageRangesPromise + + ## Active filters for the events list + $scope.filters = + category_id: null + theme_id: null + age_range_id: null + + + ## - # Adds EVENTS_PER_PAGE events to the bottom of the page, grouped by month + # Adds a resultset of events to the bottom of the page, grouped by month ## $scope.loadMoreEvents = -> - Event.query {page: $scope.page}, (data) -> + Event.query Object.assign({page: $scope.page}, $scope.filters), (data) -> $scope.events = $scope.events.concat data - if data.length > 0 - $scope.paginateActive = false if ($scope.page-2)*EVENTS_PER_PAGE+data.length >= data[0].nb_total_events + groupEvents(data) + $scope.page += 1 - $scope.eventsGroupByMonth = _.groupBy($scope.events, (obj) -> - _.map ['month', 'year'], (key, value) -> obj[key] - ) - $scope.monthOrder = _.sortBy _.keys($scope.eventsGroupByMonth), (k)-> - monthYearArray = k.split(',') - date = new Date() - date.setMonth(monthYearArray[0]) - date.setYear(monthYearArray[1]) - return -date.getTime() - else - $scope.paginateActive = false - $scope.page += 1 + if (!data[0] || data[0].nb_total_events <= $scope.events.length) + $scope.noMoreResults = true @@ -55,13 +53,58 @@ Application.Controllers.controller "EventsController", ["$scope", "$state", 'Eve + ## + # Callback to refresh the events list according to the filters set + ## + $scope.filterEvents = -> + # reinitialize results datasets + $scope.page = 1 + $scope.eventsGroupByMonth = {} + $scope.events = [] + $scope.monthOrder = [] + + # run a search query + Event.query Object.assign({page: $scope.page}, $scope.filters), (data) -> + $scope.events = data + groupEvents(data) + $scope.page += 1 + + if (!data[0] || data[0].nb_total_events <= $scope.events.length) + $scope.noMoreResults = true + + + ### PRIVATE SCOPE ### ## # Kind of constructor: these actions will be realized first when the controller is loaded ## initialize = -> - $scope.loadMoreEvents() + $scope.filterEvents() + + + + ## + # Group the provided events by month/year and concat them with existing results + # Then compute the ordered list of months for the complete resultset. + # Affect the resulting events groups in $scope.eventsGroupByMonth and the ordered month keys in $scope.monthOrder. + # @param {Array} Events retrived from the API + ## + groupEvents = (events) -> + if events.length > 0 + eventsGroupedByMonth = _.groupBy(events, (obj) -> + _.map ['month', 'year'], (key, value) -> obj[key] + ) + $scope.eventsGroupByMonth = Object.assign($scope.eventsGroupByMonth, eventsGroupedByMonth) + + monthsOrder = _.sortBy _.keys($scope.eventsGroupByMonth), (k)-> + monthYearArray = k.split(',') + date = new Date() + date.setMonth(monthYearArray[0]) + date.setYear(monthYearArray[1]) + return -date.getTime() + + $scope.monthOrder = monthsOrder diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb index 4f525dfb3..6b3f32cde 100644 --- a/app/assets/javascripts/router.coffee.erb +++ b/app/assets/javascripts/router.coffee.erb @@ -439,6 +439,15 @@ angular.module('application.router', ['ui.router']). templateUrl: '<%= asset_path "events/index.html" %>' controller: 'EventsController' resolve: + categoriesPromise: ['Category', (Category) -> + Category.query().$promise + ] + themesPromise: ['EventTheme', (EventTheme) -> + EventTheme.query().$promise + ] + ageRangesPromise: ['AgeRange', (AgeRange) -> + AgeRange.query().$promise + ] translations: [ 'Translations', (Translations) -> Translations.query('app.public.events_list').$promise ] diff --git a/app/assets/templates/events/index.html.erb b/app/assets/templates/events/index.html.erb index 51c777689..57da0876b 100644 --- a/app/assets/templates/events/index.html.erb +++ b/app/assets/templates/events/index.html.erb @@ -20,38 +20,58 @@
-
-

{{month.split(',')[0]}}, {{month.split(',')[1]}}

+
+
+ +
-
- -
- - - -
-
{{event.categories[0].name}}
-

{{event.title}}

-

{{event.start_date | amDateFormat:'L'}} {{ 'to_date' }} {{event.end_date | amDateFormat:'L'}}

- -
{{ 'full_price_' | translate }} {{event.amount | currency}} / {{ 'reduced_rate_' | translate }} {{event.reduced_amount | currency}}
-
- -
- - -
- - +
+ +
+
+ +
+
+ +
+

{{month.split(',')[0]}}, {{month.split(',')[1]}}

+ +
+ +
+ + + +
+
{{event.categories[0].name}}
+

{{event.title}}

+

{{event.start_date | amDateFormat:'L'}} {{ 'to_date' }} {{event.end_date | amDateFormat:'L'}}

+ +
{{ 'full_price_' | translate }} {{event.amount | currency}} / {{ 'reduced_rate_' | translate }} {{event.reduced_amount | currency}}
+
+ +
+ + +
+ + + +
-
- {{ 'load_the_next_events' }} + {{ 'load_the_next_events' }}
diff --git a/app/controllers/api/age_ranges_controller.rb b/app/controllers/api/age_ranges_controller.rb index 3b4f1bc56..a597c5868 100644 --- a/app/controllers/api/age_ranges_controller.rb +++ b/app/controllers/api/age_ranges_controller.rb @@ -1,9 +1,8 @@ class API::AgeRangesController < API::ApiController - before_action :authenticate_user! + before_action :authenticate_user!, except: [:index] before_action :set_age_range, only: [:show, :update, :destroy] def index - authorize AgeRange @age_ranges = AgeRange.all end diff --git a/app/controllers/api/categories_controller.rb b/app/controllers/api/categories_controller.rb index 4151ea348..a3d08caa5 100644 --- a/app/controllers/api/categories_controller.rb +++ b/app/controllers/api/categories_controller.rb @@ -1,9 +1,8 @@ class API::CategoriesController < API::ApiController - before_action :authenticate_user! + before_action :authenticate_user!, except: [:index] before_action :set_category, only: [:show, :update, :destroy] def index - authorize Category @categories = Category.all end diff --git a/app/controllers/api/event_themes_controller.rb b/app/controllers/api/event_themes_controller.rb index 3685d588b..ee7febed5 100644 --- a/app/controllers/api/event_themes_controller.rb +++ b/app/controllers/api/event_themes_controller.rb @@ -1,9 +1,8 @@ class API::EventThemesController < API::ApiController - before_action :authenticate_user! + before_action :authenticate_user!, except: [:index] before_action :set_event_theme, only: [:show, :update, :destroy] def index - authorize EventTheme @event_themes = EventTheme.all end diff --git a/app/controllers/api/events_controller.rb b/app/controllers/api/events_controller.rb index b17dd3b6f..8661801d1 100644 --- a/app/controllers/api/events_controller.rb +++ b/app/controllers/api/events_controller.rb @@ -3,9 +3,16 @@ class API::EventsController < API::ApiController def index @events = policy_scope(Event) - @total = @events.count @page = params[:page] + + # filters + @events = @events.joins(:categories).where('categories.id = :category', category: params[:category_id]) if params[:category_id] + @events = @events.joins(:event_themes).where('event_themes.id = :theme', theme: params[:theme_id]) if params[:theme_id] + @events = @events.where('age_range_id = :age_range', age_range: params[:age_range_id]) if params[:age_range_id] + + # paginate @events = @events.page(@page).per(12) + end # GET /events/upcoming/:limit diff --git a/app/policies/age_range_policy.rb b/app/policies/age_range_policy.rb index 77438111d..51c14003a 100644 --- a/app/policies/age_range_policy.rb +++ b/app/policies/age_range_policy.rb @@ -1,5 +1,5 @@ class AgeRangePolicy < ApplicationPolicy - %w(index create update destroy show).each do |action| + %w(create update destroy show).each do |action| define_method "#{action}?" do user.is_admin? end diff --git a/app/policies/category_policy.rb b/app/policies/category_policy.rb index cd29fbf7f..40ef36813 100644 --- a/app/policies/category_policy.rb +++ b/app/policies/category_policy.rb @@ -1,5 +1,5 @@ class CategoryPolicy < ApplicationPolicy - %w(index create update destroy show).each do |action| + %w(create update destroy show).each do |action| define_method "#{action}?" do user.is_admin? end diff --git a/app/policies/event_theme_policy.rb b/app/policies/event_theme_policy.rb index 1604ace16..750790c51 100644 --- a/app/policies/event_theme_policy.rb +++ b/app/policies/event_theme_policy.rb @@ -1,5 +1,5 @@ class EventThemePolicy < ApplicationPolicy - %w(index create update destroy show).each do |action| + %w(create update destroy show).each do |action| define_method "#{action}?" do user.is_admin? end diff --git a/app/views/api/events/index.json.jbuilder b/app/views/api/events/index.json.jbuilder index c95bf00a7..0b1d41d69 100644 --- a/app/views/api/events/index.json.jbuilder +++ b/app/views/api/events/index.json.jbuilder @@ -1,8 +1,10 @@ +total = @events.count + json.cache! [@events, @page] do json.array!(@events) do |event| json.partial! 'api/events/event', event: event json.event_image_small event.event_image.attachment.small.url if event.event_image json.url event_url(event, format: :json) - json.nb_total_events @total + json.nb_total_events total end end diff --git a/app/views/api/invoices/list.json.jbuilder b/app/views/api/invoices/list.json.jbuilder index 4604e4604..97795c6ad 100644 --- a/app/views/api/invoices/list.json.jbuilder +++ b/app/views/api/invoices/list.json.jbuilder @@ -1,7 +1,7 @@ -maxInvoices = @invoices.except(:offset, :limit, :order).count +max_invoices = @invoices.except(:offset, :limit, :order).count json.array!(@invoices) do |invoice| - json.maxInvoices maxInvoices + json.maxInvoices max_invoices json.extract! invoice, :id, :created_at, :reference, :invoiced_type, :user_id, :avoir_date json.total (invoice.total / 100.00) json.url invoice_url(invoice, format: :json) diff --git a/app/views/api/members/index.json.jbuilder b/app/views/api/members/index.json.jbuilder index 89167ffe2..60104ebcf 100644 --- a/app/views/api/members/index.json.jbuilder +++ b/app/views/api/members/index.json.jbuilder @@ -1,8 +1,8 @@ user_is_admin = (current_user and current_user.is_admin?) -maxMembers = @query.except(:offset, :limit, :order).count +max_members = @query.except(:offset, :limit, :order).count json.array!(@members) do |member| - json.maxMembers maxMembers + json.maxMembers max_members json.id member.id json.username member.username json.slug member.slug diff --git a/app/views/api/members/list.json.jbuilder b/app/views/api/members/list.json.jbuilder index 15ab9a462..524d45ea7 100644 --- a/app/views/api/members/list.json.jbuilder +++ b/app/views/api/members/list.json.jbuilder @@ -1,7 +1,7 @@ -maxMembers = @query.except(:offset, :limit, :order).count +max_members = @query.except(:offset, :limit, :order).count json.array!(@members) do |member| - json.maxMembers maxMembers + json.maxMembers max_members json.id member.id json.email member.email if current_user json.profile do diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index e1025026d..24f6c02c7 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -132,7 +132,6 @@ en: my_projects: "My projects" projects_to_whom_i_take_part_in: "Projects to whom I take part in" all_machines: "All machines" - all_themes: "All themes" all_materials: "All materials" load_next_projects: "Load next projects" @@ -200,6 +199,8 @@ en: events_list: # Fablab's events list the_fablab_s_events: "The Fablab's events" + all_categories: "All categories" + for_all: "For all" events_show: # details and booking of an event diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 27256d0b0..130abd45c 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -132,7 +132,6 @@ fr: my_projects: "Mes projets" projects_to_whom_i_take_part_in: "Les projets auxquels je collabore" all_machines: "Toutes les machines" - all_themes: "Toutes les thématiques" all_materials: "Tous les matériaux" load_next_projects: "Charger les projets suivants" @@ -200,6 +199,8 @@ fr: events_list: # liste des évènements du fablab the_fablab_s_events: "Les évènements du Fab Lab" + all_categories: "Toutes les catégories" + for_all: "Tout public" events_show: # détails d'un événement et réservation diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index 1478d8cc5..b30ae8140 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -87,6 +87,7 @@ en: _click_on_the_synchronization_button_opposite_: "click on the synchronization button opposite" _disconnect_then_reconnect_: "disconnect then reconnect" _for_your_changes_to_take_effect: "for your changes to take effect." + all_themes: "All themes" messages: you_will_lose_any_unsaved_modification_if_you_quit_this_page: "You will lose any unsaved modification if you quit this page" diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 51984c2f0..a4716f1d9 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -87,6 +87,7 @@ fr: _click_on_the_synchronization_button_opposite_: "cliquez sur le bouton de synchronisation ci-contre" _disconnect_then_reconnect_: "déconnectez-vous puis re-connectez vous" _for_your_changes_to_take_effect: "pour que les modifications soient prises en compte." + all_themes: "Toutes les thématiques" messages: you_will_lose_any_unsaved_modification_if_you_quit_this_page: "Vous perdrez les modifications non enregistrées si vous quittez cette page"