diff --git a/app/assets/javascripts/controllers/admin/groups.coffee.erb b/app/assets/javascripts/controllers/admin/groups.coffee.erb index 1e4cf1d86..4f3a36873 100644 --- a/app/assets/javascripts/controllers/admin/groups.coffee.erb +++ b/app/assets/javascripts/controllers/admin/groups.coffee.erb @@ -3,10 +3,10 @@ Application.Controllers.controller "GroupsController", ["$scope", 'groupsPromise ## List of users groups $scope.groups = groupsPromise - ## Default: we show only enabled plans + ## Default: we show only enabled groups $scope.groupFiltering = 'enabled' - ## Available options for filtering plans by status + ## Available options for filtering groups by status $scope.filterDisabled = [ 'enabled', 'disabled', diff --git a/app/assets/javascripts/controllers/admin/trainings.coffee.erb b/app/assets/javascripts/controllers/admin/trainings.coffee.erb index e7d5dc317..8cf29d565 100644 --- a/app/assets/javascripts/controllers/admin/trainings.coffee.erb +++ b/app/assets/javascripts/controllers/admin/trainings.coffee.erb @@ -177,6 +177,16 @@ Application.Controllers.controller "TrainingsAdminController", ["$scope", "$stat ## Binding for the parseInt function $scope.parseInt = parseInt + ## Default: we show only enabled trainings + $scope.trainingFiltering = 'enabled' + + ## Available options for filtering trainings by status + $scope.filterDisabled = [ + 'enabled', + 'disabled', + 'all', + ] + ## # In the trainings listing tab, return the stringified list of machines associated with the provided training # @param training {Object} Training object, inherited from $resource diff --git a/app/assets/templates/admin/trainings/index.html.erb b/app/assets/templates/admin/trainings/index.html.erb index 93f2cb190..647098869 100644 --- a/app/assets/templates/admin/trainings/index.html.erb +++ b/app/assets/templates/admin/trainings/index.html.erb @@ -21,7 +21,20 @@
- +
+ +
+
+ + +
+
+
@@ -33,7 +46,7 @@ - + diff --git a/app/assets/templates/admin/trainings/new.html.erb b/app/assets/templates/admin/trainings/new.html.erb index 7635f836d..05a9a9177 100644 --- a/app/assets/templates/admin/trainings/new.html.erb +++ b/app/assets/templates/admin/trainings/new.html.erb @@ -7,7 +7,7 @@
-

{{ 'add_a_new_training' }}

+

{{ 'trainings_new.add_a_new_training' }}

@@ -22,8 +22,8 @@
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 1cf5b6ad8..840d5db52 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -73,6 +73,9 @@ en: trainings: # track and monitor the trainings training: "Training" + add_a_new_training: "Add a new training" + associated_machines: "Associated machines" + number_of_tickets: "Number of tickets" year_NUMBER: "Year {{NUMBER}}" # angular interpolation month_of_NAME: "Month of {{NAME}}" # angular interpolation NUMBER_reservation: "{NUMBER} {NUMBER, plural, one{reservation} other{reservations}}" # messageFormat interpolation @@ -89,11 +92,16 @@ en: training_successfully_deleted: "Training successfully deleted." unable_to_delete_the_training_because_some_users_alredy_booked_it: "Unable to delete the training because some users already booked it." do_you_really_want_to_delete_this_training: "Do you really want to delete this training?" + status_enabled: "Enabled" + status_disabled: "Disabled" + status_all: "All" trainings_new: # create a new training - beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Beware, when creating a training, its reservation prices are initialized at zero." - dont_forget_to_change_them_before_creating_slots_for_this_training: "Don't forget to change them before creating slots for this training." + trainings_new: + add_a_new_training: "Add a new training" + beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Beware, when creating a training, its reservation prices are initialized at zero." + dont_forget_to_change_them_before_creating_slots_for_this_training: "Don't forget to change them before creating slots for this training." events: # events tracking and management diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 3b7c5eaa9..9180c7e67 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -73,6 +73,9 @@ fr: trainings: # suivre et surveiller les formations training: "Formation" + add_a_new_training: "Ajouter une nouvelle formation" + associated_machines: "Machines associées" + number_of_tickets: "Nombre de places" year_NUMBER: "Année {{NUMBER}}" # angular interpolation month_of_NAME: "Mois de {{NAME}}" # angular interpolation NUMBER_reservation: "{NUMBER} {NUMBER, plural, =0{réservation} one{réservation} other{réservations}}" # messageFormat interpolation @@ -89,11 +92,16 @@ fr: training_successfully_deleted: "La formation a bien été supprimée." unable_to_delete_the_training_because_some_users_alredy_booked_it: "La formation ne peut pas être supprimée car elle a déjà été réservée par des utilisateurs." do_you_really_want_to_delete_this_training: "Êtes-vous sur de vouloir supprimer cette formation ?" + status_enabled: "Actifs" + status_disabled: "Désactivés" + status_all: "Tous" trainings_new: # créer une nouvelle formation - beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Attention, lors de la création d'une formation, ses tarifs de réservation sont initialisés à zero." - dont_forget_to_change_them_before_creating_slots_for_this_training: "Pensez à les modifier avant de créer des créneaux pour cette formation." + trainings_new: + add_a_new_training: "Ajouter une nouvelle formation" + beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Attention, lors de la création d'une formation, ses tarifs de réservation sont initialisés à zero." + dont_forget_to_change_them_before_creating_slots_for_this_training: "Pensez à les modifier avant de créer des créneaux pour cette formation." events: # gestion et suivi des évènements diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index afae56266..72edab2fb 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -73,6 +73,9 @@ pt: trainings: # track and monitor the trainings training: "Treinamento" + add_a_new_training: "Adicionar um novo treinamento" + associated_machines: "Máquinas associadas" + number_of_tickets: "Número de vagas" year_NUMBER: "Ano {{NUMBER}}" # angular interpolation month_of_NAME: "Mês de {{NAME}}" # angular interpolation NUMBER_reservation: "{NUMBER} {NUMBER, plural, one{reserva} other{reservas}}" # messageFormat interpolation @@ -89,11 +92,16 @@ pt: training_successfully_deleted: "O treinamento foi deletado com sucesso." unable_to_delete_the_training_because_some_users_alredy_booked_it: "Não é possível deletar o treinamento, pois alguns membros já o reservaram." do_you_really_want_to_delete_this_training: "Você realmente quer deletar este treinamento?" + status_enabled: "Ativos" + status_disabled: "Desabilitados" + status_all: "Todos" trainings_new: # create a new training - beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Cuidado, ao criar um treinamento, seu preço de reserva é inicializado em zero." - dont_forget_to_change_them_before_creating_slots_for_this_training: "Não se esqueça de alterá-lo antes de criar slots para este treinamento." + trainings_new: + add_a_new_training: "Adicionar um novo treinamento" + beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Cuidado, ao criar um treinamento, seu preço de reserva é inicializado em zero." + dont_forget_to_change_them_before_creating_slots_for_this_training: "Não se esqueça de alterá-lo antes de criar slots para este treinamento." events: # events tracking and management
{{ training.name }} {{ showMachines(training) }} {{ training.nb_total_places }}