From 1bd502cd0460c20fd307b88629319e2212532a82 Mon Sep 17 00:00:00 2001 From: Nicolas Florentin Date: Wed, 7 Sep 2016 12:27:14 +0200 Subject: [PATCH 001/289] Create ISSUE_TEMPLATE.md --- .github/ISSUE_TEMPLATE.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..08f52b2da --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,8 @@ +This issue tracker is **reserved** for bug reports and feature requests. + +The place to ask a question or call for help is at Fab-manager forums at https://forum.fab-manager.com/. + +To report a bug, please describe: +- Expected behavior and actual behavior. +- Steps to reproduce the problem. +- Specifications like the version of the project, operating system, or hardware. From a5c6ba5f7da11e88a5478ccb3f8934a5f54d29d5 Mon Sep 17 00:00:00 2001 From: Vincent Date: Thu, 15 Sep 2016 21:50:08 +0200 Subject: [PATCH 002/289] add RSS feed to projects index --- app/views/api/projects/index.rss.builder | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 app/views/api/projects/index.rss.builder diff --git a/app/views/api/projects/index.rss.builder b/app/views/api/projects/index.rss.builder new file mode 100644 index 000000000..c9579e36b --- /dev/null +++ b/app/views/api/projects/index.rss.builder @@ -0,0 +1,23 @@ +#encoding: UTF-8 + +xml.instruct! :xml, version: "1.0" +xml.rss version: "2.0" do + xml.channel do + xml.title "#{t('app.public.projects_list.the_fablab_projects')} - #{Setting.find_by(name: 'fablab_name').value}" + xml.description t('app.public.projects_list.all_projects') + xml.author Setting.find_by(name: 'fablab_name').value + xml.link request.base_url + "/#!/projects" + xml.language I18n.locale.to_s + + @projects.each do |project| + xml.item do + xml.guid project.id + xml.pubDate project.created_at.strftime("%F %T") + xml.title project.name + xml.link request.base_url + "/#!/projects/" + project.slug + xml.author project.author.first_name + xml.description project.description + end + end + end +end From 6920793ce1efdf881ffef9a83546a5f2cff75e14 Mon Sep 17 00:00:00 2001 From: Vincent Date: Thu, 15 Sep 2016 22:22:35 +0200 Subject: [PATCH 003/289] add RSS feed to events index --- app/views/api/events/index.rss.builder | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/views/api/events/index.rss.builder diff --git a/app/views/api/events/index.rss.builder b/app/views/api/events/index.rss.builder new file mode 100644 index 000000000..b6dff9674 --- /dev/null +++ b/app/views/api/events/index.rss.builder @@ -0,0 +1,21 @@ +#encoding: UTF-8 + +xml.instruct! :xml, version: "1.0" +xml.rss version: "2.0" do + xml.channel do + xml.title "#{t('app.public.events_list.the_fablab_s_courses_and_workshops')} - #{Setting.find_by(name: 'fablab_name').value}" + xml.author Setting.find_by(name: 'fablab_name').value + xml.link request.base_url + "/#!/events" + xml.language I18n.locale.to_s + + @events.each do |event| + xml.item do + xml.guid event.id + xml.pubDate event.created_at.strftime("%F %T") + xml.title event.name + xml.link request.base_url + "/#!/events/" + event.id.to_s + xml.description event.description + end + end + end +end From 1a0e5519f6c5fe9b1d5b4b628e56ae4defc3c6d8 Mon Sep 17 00:00:00 2001 From: Peng DU Date: Tue, 20 Sep 2016 11:39:49 +0200 Subject: [PATCH 004/289] change groups cache key name --- app/views/api/groups/index.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/api/groups/index.json.jbuilder b/app/views/api/groups/index.json.jbuilder index fb5c92e77..6a8f3029e 100644 --- a/app/views/api/groups/index.json.jbuilder +++ b/app/views/api/groups/index.json.jbuilder @@ -1,3 +1,3 @@ -json.cache! @groups do +json.cache! ['v1', @groups] do json.partial! 'api/groups/group', collection: @groups, as: :group end From 838d9b9542a6bfee37a992d8d8bf6024c6b85f7f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 26 Sep 2016 11:21:25 +0200 Subject: [PATCH 005/289] Release 2.3.1 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e493ecec1..e02eb9107 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog Fab Manager +## v2.3.1 2016 September 26 + +- Fix a bug: group cache filename too long + ## v2.3.0 2016 June 28 - Public API with access management and online documentation From 36524d4cd999e8cf252e628e8f9dcfc520e72088 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 27 Sep 2016 14:08:04 +0200 Subject: [PATCH 006/289] display list of allowed extensions in project's CAD attachments --- CHANGELOG.md | 3 ++- README.md | 23 +++++++++++++++++++ .../controllers/projects.coffee.erb | 19 +++++++++------ app/assets/javascripts/router.coffee.erb | 6 +++++ .../javascripts/services/project.coffee | 4 ++++ app/assets/templates/projects/_form.html.erb | 22 ++++++++++-------- app/controllers/api/projects_controller.rb | 4 ++++ app/models/project_cao.rb | 10 +------- app/uploaders/project_cao_uploader.rb | 2 +- config/application.yml.default | 3 +++ config/locales/app.shared.en.yml | 1 + config/locales/app.shared.fr.yml | 1 + config/routes.rb | 3 ++- 13 files changed, 73 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1d758255..e5a3aa95e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ - Admins can toggle reminders on/off and customize the delay - More file types allowed as project CAD attachements - Project CAD attachements are now checked by MIME type in addition of extension check +- Project CAD attachement allowed are now configured in environment variables - Display strategy's name in SSO providers list - SSO: documentation improved with an usage example - SSO: mapped fields display their data type. Integers, booleans and dates allow some transformations. @@ -56,7 +57,7 @@ - [TODO DEPLOY] `rake fablab:es_add_event_filters` - [TODO DEPLOY] `rake db:migrate` - [TODO DEPLOY] `bundle install` -- [TODO DEPLOY] add `EXCEL_DATE_FORMAT` environment variable in `application.yml` +- [TODO DEPLOY] add `EXCEL_DATE_FORMAT`, `ALLOWED_EXTENSIONS` and `ALLOWED_MIME_TYPES` environment variable in `application.yml` - [OPTIONAL] `rake fablab:fix:assign_category_to_uncategorized_events` (will put every non-categorized events into a new category called "No Category", to ease re-categorization) ## v2.3.1 2016 September 26 diff --git a/README.md b/README.md index 058494c52..743887833 100644 --- a/README.md +++ b/README.md @@ -239,6 +239,29 @@ Retrieve them from https://apps.twitter.com This is optional. You can follow [this guide to get your personal App ID](https://developers.facebook.com/docs/apps/register). If you do so, you'll be able to customize and get statistics about project shares on Facebook. + LOG_LEVEL + +This parameter configures the logs verbosity. +Available log levels can be found [here](http://guides.rubyonrails.org/debugging_rails_applications.html#log-levels). + + ALLOWED_EXTENSIONS + +Exhaustive list of file's extensions available for public upload as project's CAO attachements. +Each item in the list must be separated from the others by a space char. +You will probably want to check that this list match the `ALLOWED_MIME_TYPES` values below. +Please consider that allowing file archives (eg. ZIP) or binary executable (eg. EXE) may result in a **dangerous** security issue and must be avoided in any cases. + + ALLOWED_MIME_TYPES + +Exhaustive list of file's mime-types available for public upload as project's CAO attachements. +Each item in the list must be separated from the others by a space char. +You will probably want to check that this list match the `ALLOWED_EXTENSIONS` values above. +Please consider that allowing file archives (eg. application/zip) or binary executable (eg. application/exe) may result in a **dangerous** security issue and must be avoided in any cases. + + Settings related to Open Projects + +See the [Open Projects](#open-projects) section for a detailed description of these parameters. + Settings related to i18n See the [Settings](#i18n-settings) section of the [Internationalization (i18n)](#i18n) paragraph for a detailed description of these parameters. diff --git a/app/assets/javascripts/controllers/projects.coffee.erb b/app/assets/javascripts/controllers/projects.coffee.erb index a30a96d9a..c34e97e4d 100644 --- a/app/assets/javascripts/controllers/projects.coffee.erb +++ b/app/assets/javascripts/controllers/projects.coffee.erb @@ -12,6 +12,7 @@ # - $scope.components = [{Component}] # - $scope.themes = [{Theme}] # - $scope.licences = [{Licence}] +# - $scope.allowedExtensions = [{String}] # - $scope.submited(content) # - $scope.cancel() # - $scope.addFile() @@ -26,7 +27,7 @@ # - $state (Ui-Router) [ 'app.public.projects_show', 'app.public.projects_list' ] ## class ProjectsController - constructor: ($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, Diacritics, dialogs, _t)-> + constructor: ($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, Diacritics, dialogs, allowedExtensions, _t)-> ## Retrieve the list of machines from the server Machine.query().$promise.then (data)-> @@ -52,8 +53,12 @@ class ProjectsController id: d.id name: d.name + ## Total number of documentation steps for the current project $scope.totalSteps = $scope.project.project_steps_attributes.length + ## List of extensions allowed for CAD attachements upload + $scope.allowedExtensions = allowedExtensions + ## @@ -315,8 +320,8 @@ Application.Controllers.controller "ProjectsController", ["$scope", "$state", 'P ## # Controller used in the project creation page ## -Application.Controllers.controller "NewProjectController", ["$scope", "$state", 'Project', 'Machine', 'Member', 'Component', 'Theme', 'Licence', '$document', 'CSRF', 'Diacritics', 'dialogs', '_t' -, ($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, CSRF, Diacritics, dialogs, _t) -> +Application.Controllers.controller "NewProjectController", ["$scope", "$state", 'Project', 'Machine', 'Member', 'Component', 'Theme', 'Licence', '$document', 'CSRF', 'Diacritics', 'dialogs', 'allowedExtensions', '_t' +, ($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, CSRF, Diacritics, dialogs, allowedExtensions, _t) -> CSRF.setMetaTags() ## API URL where the form will be posted @@ -333,7 +338,7 @@ Application.Controllers.controller "NewProjectController", ["$scope", "$state", $scope.matchingMembers = [] ## Using the ProjectsController - new ProjectsController($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, Diacritics, dialogs, _t) + new ProjectsController($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, Diacritics, dialogs, allowedExtensions, _t) ] @@ -341,8 +346,8 @@ Application.Controllers.controller "NewProjectController", ["$scope", "$state", ## # Controller used in the project edition page ## -Application.Controllers.controller "EditProjectController", ["$scope", "$state", '$stateParams', 'Project', 'Machine', 'Member', 'Component', 'Theme', 'Licence', '$document', 'CSRF', 'projectPromise', 'Diacritics', 'dialogs', '_t' -, ($scope, $state, $stateParams, Project, Machine, Member, Component, Theme, Licence, $document, CSRF, projectPromise, Diacritics, dialogs, _t) -> +Application.Controllers.controller "EditProjectController", ["$scope", "$state", '$stateParams', 'Project', 'Machine', 'Member', 'Component', 'Theme', 'Licence', '$document', 'CSRF', 'projectPromise', 'Diacritics', 'dialogs', 'allowedExtensions', '_t' +, ($scope, $state, $stateParams, Project, Machine, Member, Component, Theme, Licence, $document, CSRF, projectPromise, Diacritics, dialogs, allowedExtensions, _t) -> CSRF.setMetaTags() ## API URL where the form will be posted @@ -359,7 +364,7 @@ Application.Controllers.controller "EditProjectController", ["$scope", "$state", name: u.full_name ## Using the ProjectsController - new ProjectsController($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, Diacritics, dialogs, _t) + new ProjectsController($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, Diacritics, dialogs, allowedExtensions, _t) ] diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb index 8d5984205..5d7f16cc0 100644 --- a/app/assets/javascripts/router.coffee.erb +++ b/app/assets/javascripts/router.coffee.erb @@ -270,6 +270,9 @@ angular.module('application.router', ['ui.router']). templateUrl: '<%= asset_path "projects/new.html" %>' controller: 'NewProjectController' resolve: + allowedExtensions: ['Project', (Project)-> + Project.allowedExtensions().$promise + ] translations: [ 'Translations', (Translations) -> Translations.query(['app.logged.projects_new', 'app.shared.project']).$promise ] @@ -296,6 +299,9 @@ angular.module('application.router', ['ui.router']). projectPromise: ['$stateParams', 'Project', ($stateParams, Project)-> Project.get(id: $stateParams.id).$promise ] + allowedExtensions: ['Project', (Project)-> + Project.allowedExtensions().$promise + ] translations: [ 'Translations', (Translations) -> Translations.query(['app.logged.projects_edit', 'app.shared.project']).$promise ] diff --git a/app/assets/javascripts/services/project.coffee b/app/assets/javascripts/services/project.coffee index 96c993506..7cfbaeab6 100644 --- a/app/assets/javascripts/services/project.coffee +++ b/app/assets/javascripts/services/project.coffee @@ -11,4 +11,8 @@ Application.Services.factory 'Project', ["$resource", ($resource)-> method: 'GET' url: '/api/projects/search' isArray: false + allowedExtensions: + method: 'GET' + url: '/api/projects/allowed_extensions' + isArray: true ] diff --git a/app/assets/templates/projects/_form.html.erb b/app/assets/templates/projects/_form.html.erb index e660e0501..8c75407e4 100644 --- a/app/assets/templates/projects/_form.html.erb +++ b/app/assets/templates/projects/_form.html.erb @@ -42,18 +42,22 @@
- - +
+ + -
-
- {{file.attachment}} +
+
+ {{file.attachment}} +
+ {{ 'browse' }} + {{ 'change' }} +
- {{ 'browse' }} - {{ 'change' }} -
- +
+ +
{{ 'add_a_new_file' | translate }}
diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index 2a6d4fffe..6dcc23b7b 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -57,6 +57,10 @@ class API::ProjectsController < API::ApiController render :index end + def allowed_extensions + render json: ENV['ALLOWED_EXTENSIONS'].split(' '), status: :ok + end + private def set_project @project = Project.find(params[:id]) diff --git a/app/models/project_cao.rb b/app/models/project_cao.rb index 49fe45248..a394a7811 100644 --- a/app/models/project_cao.rb +++ b/app/models/project_cao.rb @@ -2,13 +2,5 @@ class ProjectCao < Asset mount_uploader :attachment, ProjectCaoUploader validates :attachment, file_size: { maximum: 20.megabytes.to_i } - validates :attachment, :file_mime_type => { - :content_type => %w(application/pdf application/postscript application/illustrator - image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg - application/octet-stream application/step application/iges model/iges x-world/x-3dmf - application/ application/vnd.openxmlformats-officedocument.wordprocessingml.document - image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp - application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex - application/x-latex) - } + validates :attachment, :file_mime_type => { :content_type => ENV['ALLOWED_MIME_TYPES'].split(' ') } end diff --git a/app/uploaders/project_cao_uploader.rb b/app/uploaders/project_cao_uploader.rb index 11777d649..fb5e4903e 100644 --- a/app/uploaders/project_cao_uploader.rb +++ b/app/uploaders/project_cao_uploader.rb @@ -39,7 +39,7 @@ class ProjectCaoUploader < CarrierWave::Uploader::Base # Add a white list of extensions which are allowed to be uploaded. # For images you might use something like this: def extension_white_list - %w(pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps) + ENV['ALLOWED_EXTENSIONS'].split(' ') end # Override the filename of the uploaded files: diff --git a/config/application.yml.default b/config/application.yml.default index 723fb39b1..c46ee4815 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -56,3 +56,6 @@ OPENLAB_APP_ID: OPENLAB_BASE_URI: 'https://openprojects.fab-manager.com' LOG_LEVEL: 'debug' + +ALLOWED_EXTENSIONS: pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps +ALLOWED_MIME_TYPES: application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/ application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index d76a8ffec..c8d06c2f5 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -128,6 +128,7 @@ en: illustration: "Illustration" add_an_illustration: "Add an illustration" CAD_file: "CAD file" + allowed_extensions: "Allowed extensions:" add_a_new_file: "Add a new file" steps: "Steps" step_title: "Step title" diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index a10871241..8e18fe73a 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -128,6 +128,7 @@ fr: illustration: "Illustration" add_an_illustration: "Ajouter un visuel" CAD_file: "Fichier CAO" + allowed_extensions: "Extensions autorisées :" add_a_new_file: "Ajouter un nouveau fichier" steps: "Étapes" step_title: "Titre de l'étape" diff --git a/config/routes.rb b/config/routes.rb index 66ac9ce89..bfcaac9f6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,10 +26,11 @@ Rails.application.routes.draw do root 'application#index' namespace :api, as: nil, defaults: { format: :json } do - resources :projects, only: [:index, :last_published, :show, :create, :update, :destroy] do + resources :projects, only: [:index, :show, :create, :update, :destroy] do collection do get :last_published get :search + get :allowed_extensions end end resources :openlab_projects, only: :index From d45ca7213f4454a7b28f2e7aa6378eebafa3fde1 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 27 Sep 2016 14:10:00 +0200 Subject: [PATCH 007/289] updated changelog --- CHANGELOG.md | 1 + app/assets/templates/projects/_form.html.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5a3aa95e..326391584 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ - More file types allowed as project CAD attachements - Project CAD attachements are now checked by MIME type in addition of extension check - Project CAD attachement allowed are now configured in environment variables +- Project CAD attachement extensions allowed are shown next to input field - Display strategy's name in SSO providers list - SSO: documentation improved with an usage example - SSO: mapped fields display their data type. Integers, booleans and dates allow some transformations. diff --git a/app/assets/templates/projects/_form.html.erb b/app/assets/templates/projects/_form.html.erb index 8c75407e4..94a88a8a8 100644 --- a/app/assets/templates/projects/_form.html.erb +++ b/app/assets/templates/projects/_form.html.erb @@ -56,7 +56,7 @@
- +
{{ 'add_a_new_file' | translate }} From 9a71dc5ea2aeffd124410ee426cb3b5148ca6512 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 27 Sep 2016 14:56:57 +0200 Subject: [PATCH 008/289] trainings monitoring: open current year/month by default on training selection --- .../javascripts/controllers/admin/trainings.coffee.erb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/assets/javascripts/controllers/admin/trainings.coffee.erb b/app/assets/javascripts/controllers/admin/trainings.coffee.erb index 815bf8026..6ae3e12ab 100644 --- a/app/assets/javascripts/controllers/admin/trainings.coffee.erb +++ b/app/assets/javascripts/controllers/admin/trainings.coffee.erb @@ -298,6 +298,13 @@ Application.Controllers.controller "TrainingsAdminController", ["$scope", "$stat $scope.selectTrainingToMonitor = -> Training.availabilities {id: $scope.monitoring.training.id}, (training) -> $scope.groupedAvailabilities = groupAvailabilities([training]) + # we open current year/month by default + now = moment() + $scope.accordions[training.name] = {} + $scope.accordions[training.name][now.year()] = + isOpenFirst: true + $scope.accordions[training.name][now.year()][now.month()] = + isOpenFirst: true From b715078e83fac37fc018f5df348e2b06a02f9caa Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 27 Sep 2016 15:32:49 +0200 Subject: [PATCH 009/289] [admin] button to delete training from view + confirmation on machine/training deletion from view --- .../controllers/machines.coffee.erb | 20 ++++++++----- .../controllers/trainings.coffee.erb | 28 ++++++++++++++++++- app/assets/templates/trainings/show.html.erb | 1 + config/locales/app.public.en.yml | 6 +++- config/locales/app.public.fr.yml | 4 +++ 5 files changed, 50 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/controllers/machines.coffee.erb b/app/assets/javascripts/controllers/machines.coffee.erb index 12af6cb96..1144abe3f 100644 --- a/app/assets/javascripts/controllers/machines.coffee.erb +++ b/app/assets/javascripts/controllers/machines.coffee.erb @@ -231,8 +231,8 @@ Application.Controllers.controller "EditMachineController", ["$scope", '$state', ## # Controller used in the machine details page (public) ## -Application.Controllers.controller "ShowMachineController", ['$scope', '$state', '$uibModal', '$stateParams', '_t', 'Machine', 'growl', 'machinePromise' -, ($scope, $state, $uibModal, $stateParams, _t, Machine, growl, machinePromise) -> +Application.Controllers.controller "ShowMachineController", ['$scope', '$state', '$uibModal', '$stateParams', '_t', 'Machine', 'growl', 'machinePromise', 'dialogs' +, ($scope, $state, $uibModal, $stateParams, _t, Machine, growl, machinePromise, dialogs) -> ## Retrieve the details for the machine id in the URL, if an error occurs redirect the user to the machines list $scope.machine = machinePromise @@ -245,11 +245,17 @@ Application.Controllers.controller "ShowMachineController", ['$scope', '$state', if $scope.currentUser.role isnt 'admin' console.error _t('unauthorized_operation') else - # delete the machine then redirect to the machines listing - machine.$delete -> - $state.go('app.public.machines_list') - , (error)-> - growl.warning(_t('the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users')) + dialogs.confirm + resolve: + object: -> + title: _t('confirmation_required') + msg: _t('do_you_really_want_to_delete_this_machine') + , -> # deletion confirmed + # delete the machine then redirect to the machines listing + machine.$delete -> + $state.go('app.public.machines_list') + , (error)-> + growl.warning(_t('the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users')) ## # Callback to book a reservation for the current machine ## diff --git a/app/assets/javascripts/controllers/trainings.coffee.erb b/app/assets/javascripts/controllers/trainings.coffee.erb index e7e955351..c712583ad 100644 --- a/app/assets/javascripts/controllers/trainings.coffee.erb +++ b/app/assets/javascripts/controllers/trainings.coffee.erb @@ -26,17 +26,43 @@ Application.Controllers.controller "TrainingsController", ['$scope', '$state', ' ## # Public view of a specific training ## -Application.Controllers.controller "ShowTrainingController", ['$scope', '$state', 'trainingPromise', ($scope, $state, trainingPromise) -> +Application.Controllers.controller "ShowTrainingController", ['$scope', '$state', 'trainingPromise', 'growl', '_t', 'dialogs', ($scope, $state, trainingPromise, growl, _t, dialogs) -> ## Current training $scope.training = trainingPromise + + + ## + # Callback to delete the current training (admins only) + ## + $scope.delete = (training) -> + # check the permissions + if $scope.currentUser.role isnt 'admin' + console.error _t('unauthorized_operation') + else + dialogs.confirm + resolve: + object: -> + title: _t('confirmation_required') + msg: _t('do_you_really_want_to_delete_this_training') + , -> # deletion confirmed + # delete the training then redirect to the trainings listing + training.$delete -> + $state.go('app.public.trainings_list') + , (error)-> + growl.warning(_t('the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users')) + + + ## # Callback for the 'reserve' button ## $scope.reserveTraining = (training, event) -> $state.go('app.logged.trainings_reserve', {id: training.id}) + + ## # Revert view to the full list of trainings ("<-" button) ## diff --git a/app/assets/templates/trainings/show.html.erb b/app/assets/templates/trainings/show.html.erb index 2c470c4ad..c1ef7f3bc 100644 --- a/app/assets/templates/trainings/show.html.erb +++ b/app/assets/templates/trainings/show.html.erb @@ -18,6 +18,7 @@ {{ 'book_this_training' }} {{ 'edit' | translate }} + diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index 411ff6589..296d8fa3d 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -179,7 +179,8 @@ en: files_to_download: "Files to download" projects_using_the_machine: "Projects using the machine" _or_the_: " or the " - unauthorized_operation: "Unauthoried operation" + do_you_really_want_to_delete_this_machine: "Do you really want to delete this machine?" + unauthorized_operation: "Unauthorized operation" the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users: "The machine can't be deleted because it's already reserved by some users." trainings_list: @@ -189,6 +190,9 @@ en: training_show: # details of a training book_this_training: "Book this training" + do_you_really_want_to_delete_this_training: "Do you really want to delete this training?" + unauthorized_operation: "Unauthorized operation" + the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users: "The training can't be deleted because it's already reserved by some users." plans: # summary of the subscriptions diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 10e227a3f..d1a4420b3 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -178,6 +178,7 @@ fr: files_to_download: "Fichiers à télécharger" projects_using_the_machine: "Projets utilisant la machine" _or_the_: " ou la " + do_you_really_want_to_delete_this_machine: "Êtes-vous sur de vouloir supprimer cette machine ?" unauthorized_operation: "Opération non autorisée" the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users: "La machine ne peut pas être supprimée car elle a déjà été réservée par des utilisateurs." @@ -189,6 +190,9 @@ fr: training_show: # détails d'une formation book_this_training: "Réserver cette formation" + do_you_really_want_to_delete_this_training: "Êtes-vous sur de vouloir supprimer cette formation ?" + unauthorized_operation: "Opération non autorisée" + the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users: "La formation ne peut pas être supprimée car elle a déjà été réservée par des utilisateurs." plans: From c27c4372b0cdb755a0915ef216e53d8b176bbce8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 27 Sep 2016 15:34:30 +0200 Subject: [PATCH 010/289] updated CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 326391584..814b4bfb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog Fab Manager ## next release +- Ask for confirmation on machine deletion from the public view +- Ability to delete a training from the public view for an admin - Project images will show in full-size on a click - Add a checkbox "I accept to receive informations from the FabLab" on Sign-up dialog and user's profile - Share project with Facebook/Twitter From e48bb88f1f80371b56dadaafc78698d3cc6ba0ef Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 27 Sep 2016 16:00:22 +0200 Subject: [PATCH 011/289] use slug in traning show url --- app/assets/javascripts/controllers/trainings.coffee.erb | 4 ++-- app/controllers/api/trainings_controller.rb | 2 +- app/views/api/trainings/index.json.jbuilder | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/controllers/trainings.coffee.erb b/app/assets/javascripts/controllers/trainings.coffee.erb index c712583ad..d4377c9ab 100644 --- a/app/assets/javascripts/controllers/trainings.coffee.erb +++ b/app/assets/javascripts/controllers/trainings.coffee.erb @@ -12,13 +12,13 @@ Application.Controllers.controller "TrainingsController", ['$scope', '$state', ' # Callback for the 'reserve' button ## $scope.reserveTraining = (training, event) -> - $state.go('app.logged.trainings_reserve', {id: training.id}) + $state.go('app.logged.trainings_reserve', {id: training.slug}) ## # Callback for the 'show' button ## $scope.showTraining = (training) -> - $state.go('app.public.training_show', {id: training.id}) + $state.go('app.public.training_show', {id: training.slug}) ] diff --git a/app/controllers/api/trainings_controller.rb b/app/controllers/api/trainings_controller.rb index a00d0fc4a..45ae39af5 100644 --- a/app/controllers/api/trainings_controller.rb +++ b/app/controllers/api/trainings_controller.rb @@ -17,7 +17,7 @@ class API::TrainingsController < API::ApiController end def show - @training = Training.find(params[:id]) + @training = Training.friendly.find(params[:id]) end def create diff --git a/app/views/api/trainings/index.json.jbuilder b/app/views/api/trainings/index.json.jbuilder index 0ca39d0e3..51550ce1b 100644 --- a/app/views/api/trainings/index.json.jbuilder +++ b/app/views/api/trainings/index.json.jbuilder @@ -2,7 +2,7 @@ role = (current_user and current_user.is_admin?) ? 'admin' : 'user' json.cache! [@trainings, role] do json.array!(@trainings) do |training| - json.extract! training, :id, :name, :description, :machine_ids, :nb_total_places + json.extract! training, :id, :name, :description, :machine_ids, :nb_total_places, :slug json.training_image training.training_image.attachment.large.url if training.training_image json.plan_ids training.plan_ids if role === 'admin' end From 60d60fdd650b9c126c95da2f3189119e22f69edf Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 27 Sep 2016 16:58:57 +0200 Subject: [PATCH 012/289] use slugs in projects URL opened from notifications --- CHANGELOG.md | 1 + .../_notify_admin_when_project_published.json.jbuilder | 2 +- ..._notify_project_author_when_collaborator_valid.json.jbuilder | 2 +- .../_notify_project_collaborator_to_valid.json.jbuilder | 2 +- .../notify_admin_when_project_published.html.erb | 2 +- .../notify_project_author_when_collaborator_valid.html.erb | 2 +- .../notify_project_collaborator_to_valid.html.erb | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 814b4bfb1..c60a1ce26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog Fab Manager ## next release +- Use slugs in projects URL opened from notifications - Ask for confirmation on machine deletion from the public view - Ability to delete a training from the public view for an admin - Project images will show in full-size on a click diff --git a/app/views/api/notifications/_notify_admin_when_project_published.json.jbuilder b/app/views/api/notifications/_notify_admin_when_project_published.json.jbuilder index e90c6daf0..63bee71e1 100644 --- a/app/views/api/notifications/_notify_admin_when_project_published.json.jbuilder +++ b/app/views/api/notifications/_notify_admin_when_project_published.json.jbuilder @@ -1,5 +1,5 @@ json.title notification.notification_type json.description t('.project_NAME_has_been_published_html', - ID: notification.attached_object.id, + ID: notification.attached_object.slug, NAME: notification.attached_object.name) json.url notification_url(notification, format: :json) diff --git a/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder b/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder index 58209d776..d5dc45864 100644 --- a/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder +++ b/app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder @@ -1,5 +1,5 @@ json.title notification.notification_type json.description t('.USER_became_collaborator_of_your_project', USER: notification.attached_object.user.profile.full_name) + - " #{notification.attached_object.project.name}." + " #{notification.attached_object.project.name}." json.url notification_url(notification, format: :json) diff --git a/app/views/api/notifications/_notify_project_collaborator_to_valid.json.jbuilder b/app/views/api/notifications/_notify_project_collaborator_to_valid.json.jbuilder index f656f668d..2615f16c6 100644 --- a/app/views/api/notifications/_notify_project_collaborator_to_valid.json.jbuilder +++ b/app/views/api/notifications/_notify_project_collaborator_to_valid.json.jbuilder @@ -1,4 +1,4 @@ json.title notification.notification_type json.description t('.you_are_invited_to_collaborate_on_the_project') + - "#{notification.attached_object.project.name}." + "#{notification.attached_object.project.name}." json.url notification_url(notification, format: :json) diff --git a/app/views/notifications_mailer/notify_admin_when_project_published.html.erb b/app/views/notifications_mailer/notify_admin_when_project_published.html.erb index 0c3486e53..add5528e8 100644 --- a/app/views/notifications_mailer/notify_admin_when_project_published.html.erb +++ b/app/views/notifications_mailer/notify_admin_when_project_published.html.erb @@ -1,3 +1,3 @@ <%= render 'notifications_mailer/shared/hello', recipient: @recipient %> -

<%= t('.body.new_project_published') %> "<%= link_to @attached_object.name, "#{root_url}#!/projects/#{@attached_object.id}" %>"

+

<%= t('.body.new_project_published') %> "<%= link_to @attached_object.name, "#{root_url}#!/projects/#{@attached_object.slug}" %>"

diff --git a/app/views/notifications_mailer/notify_project_author_when_collaborator_valid.html.erb b/app/views/notifications_mailer/notify_project_author_when_collaborator_valid.html.erb index c5141f2fc..1ea34bed0 100644 --- a/app/views/notifications_mailer/notify_project_author_when_collaborator_valid.html.erb +++ b/app/views/notifications_mailer/notify_project_author_when_collaborator_valid.html.erb @@ -1,3 +1,3 @@ <%= render 'notifications_mailer/shared/hello', recipient: @recipient %> -

<%= t('.body.the_member') %> <%= @attached_object.user.profile.full_name %> <%= t(".body.accepted_your_invitation_to_take_part_in_the_project" ) %> <%= link_to @attached_object.project.name, "#{root_url}#!/projects/#{@attached_object.project.id}" %>.

+

<%= t('.body.the_member') %> <%= @attached_object.user.profile.full_name %> <%= t(".body.accepted_your_invitation_to_take_part_in_the_project" ) %> <%= link_to @attached_object.project.name, "#{root_url}#!/projects/#{@attached_object.project.slug}" %>.

diff --git a/app/views/notifications_mailer/notify_project_collaborator_to_valid.html.erb b/app/views/notifications_mailer/notify_project_collaborator_to_valid.html.erb index 1bb99907c..26e5a72ce 100644 --- a/app/views/notifications_mailer/notify_project_collaborator_to_valid.html.erb +++ b/app/views/notifications_mailer/notify_project_collaborator_to_valid.html.erb @@ -1,5 +1,5 @@ <%= render 'notifications_mailer/shared/hello', recipient: @recipient %> -

<%= t(".body.your_are_invited_to_take_part_in_a_project") %> <%= link_to @attached_object.project.name, "#{root_url}#!/projects/#{@attached_object.project.id}" %>.

+

<%= t(".body.your_are_invited_to_take_part_in_a_project") %> <%= link_to @attached_object.project.name, "#{root_url}#!/projects/#{@attached_object.project.slug}" %>.

<%= t(".body.to_accept_the_invitation_click_on_following_link") %> <%= link_to "#{root_url}project_collaborator/#{@attached_object.valid_token}", "#{root_url}project_collaborator/#{@attached_object.valid_token}" %>

From 785e9a42f897ff5e505679b4049f7b694a8a38be Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 28 Sep 2016 10:52:25 +0200 Subject: [PATCH 013/289] test fix asset:precompile --- app/assets/javascripts/controllers/admin/invoices.coffee.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/invoices.coffee.erb b/app/assets/javascripts/controllers/admin/invoices.coffee.erb index ba6dbdd13..044e8fd05 100644 --- a/app/assets/javascripts/controllers/admin/invoices.coffee.erb +++ b/app/assets/javascripts/controllers/admin/invoices.coffee.erb @@ -133,9 +133,8 @@ Application.Controllers.controller "InvoicesController", ["$scope", "$state", 'I sample = sample.replace(/X\[([^\]]+)\]/g, (match, p1, offset, string) -> p1 ) - # # information about wallet (W[text]) - does not apply here - # sample = sample.replace(/W\[([^\]]+)\]/g, "") - + # information about wallet (W[text]) - does not apply here + sample = sample.replace(/W\[([^\]]+)\]/g, "") # information about refunds (R[text]) - does not apply here sample = sample.replace(/R\[([^\]]+)\]/g, "") sample From acd6bdad34b275433f24fd7337709827469d02ff Mon Sep 17 00:00:00 2001 From: Peng DU Date: Wed, 28 Sep 2016 11:11:13 +0200 Subject: [PATCH 014/289] update gem coffee-rails --- Gemfile.lock | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b80aa12bb..6e602afad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,13 +94,13 @@ GEM cldr-plurals-runtime-rb (1.0.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) - coffee-rails (4.1.0) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) + coffee-script-source (1.10.0) compass (1.0.3) chunky_png (~> 1.2) compass-core (~> 1.0.2) @@ -157,7 +157,7 @@ GEM multi_json equalizer (0.0.11) erubis (2.7.0) - execjs (2.4.0) + execjs (2.7.0) faker (1.4.3) i18n (~> 0.5) faraday (0.9.1) @@ -222,8 +222,8 @@ GEM twitter_cldr (~> 3.1) mime-types (2.99) mini_magick (4.2.0) - mini_portile2 (2.0.0) - minitest (5.9.0) + mini_portile2 (2.1.0) + minitest (5.9.1) minitest-reporters (1.1.8) ansi builder @@ -241,8 +241,9 @@ GEM net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) netrc (0.10.3) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) notify_with (0.0.2) jbuilder (~> 2.0) rails (>= 4.2.0) @@ -265,6 +266,7 @@ GEM orm_adapter (0.5.0) pdf-core (0.5.1) pg (0.18.1) + pkg-config (1.1.7) prawn (2.0.1) pdf-core (~> 0.5.1) ttfunk (~> 1.4.0) @@ -313,7 +315,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) - rake (11.1.2) + rake (11.3.0) rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) From 5211880ed58ff5c46a6ce4a339c3becc91a66dd7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 28 Sep 2016 11:37:36 +0200 Subject: [PATCH 015/289] updated CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c60a1ce26..4a369f517 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ - Fix a bug: UI issues on small devices (dashboard + admin views) - Fix a bug: embedded video not working in training/machine description - Fix a bug: reordering project's steps trigger the unsaved-warning dialog +- Fix a bug: unable to compile assets in Docker with CoffeeScript error - [TODO DEPLOY] `rake fablab:es_build_availabilities_index` - [TODO DEPLOY] `rake fablab:es_add_event_filters` - [TODO DEPLOY] `rake db:migrate` From cd6b279af4499be33ef85d760f6e1ef504863fcc Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 28 Sep 2016 12:00:53 +0200 Subject: [PATCH 016/289] fix typo + updated docker ENV example --- doc/sso_with_github.md | 2 +- docker/env.example | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/sso_with_github.md b/doc/sso_with_github.md index dfe28c8dc..1e6a1555c 100644 --- a/doc/sso_with_github.md +++ b/doc/sso_with_github.md @@ -1,6 +1,6 @@ # How to configure Fab-manager to use a Single Sign-On authentication? -For this guide, we will use [GitHub](https://developer.github.com/v3/oauth/) as an example authentication provider, because uses OAuth 2.0 which is currently implemented in fab-manager, it has a standard implementation of that protocol and it is free to use for everyone. +For this guide, we will use [GitHub](https://developer.github.com/v3/oauth/) as an example authentication provider, because it uses OAuth 2.0 which is currently implemented in fab-manager, it has a standard implementation of the protocol and it is free to use for everyone. - First, you must have a GitHub account. This is free, so create one if you don't have any. Visit https://github.com/join?source=login to create an account. diff --git a/docker/env.example b/docker/env.example index 5498510ce..1b56819e4 100644 --- a/docker/env.example +++ b/docker/env.example @@ -55,4 +55,8 @@ OPENLAB_BASE_URI=https://openprojects.fab-manager.com NAVINUM_API_LOGIN: NAVINUM_API_PASSWORD: -LOG_LEVEL=debug \ No newline at end of file +LOG_LEVEL=debug + + +ALLOWED_EXTENSIONS=pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps +ALLOWED_MIME_TYPES=application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/ application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex From 99801bb02a752e631621d436a8a1a2ba4b5cae98 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 28 Sep 2016 12:14:21 +0200 Subject: [PATCH 017/289] improved explanation about rebuild assets --- doc/sso_with_github.md | 6 ++++-- lib/tasks/fablab.rake | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/sso_with_github.md b/doc/sso_with_github.md index 1e6a1555c..2e723592e 100644 --- a/doc/sso_with_github.md +++ b/doc/sso_with_github.md @@ -43,7 +43,7 @@ For this guide, we will use [GitHub](https://developer.github.com/v3/oauth/) as Once you have completed and validated the mapping's line, an information button will be available. A click on it will show you the type of data expected from the API and, in some cases, you'll be able to configure a transformation. - For example, the `Profile.gender` field require a booleanrake diagram:all attribute but your API may return strings like `man / woman`. + For example, the `Profile.gender` field require a boolean attribute but your API may return strings like `man / woman`. In this case, you'll be able to configure a transformation for `man` <-> `true` and `woman` <-> `false`. Now, you are free to map more fields, like `Profile.github` to `html_url`, or `Profile.avatar` to `avatar_url`... @@ -56,7 +56,9 @@ For this guide, we will use [GitHub](https://developer.github.com/v3/oauth/) as rake fablab:switch_auth_provider[GitHub] ``` -- As the command just prompted you, you have to re-compile the assets (with eg, `rake tmp:clear` - this vary with the method you used to deploy your instance) +- As the command just prompted you, you have to re-compile the assets + - In development, `rake tmp:clear` will do the job. + - In production with Docker, `rm -rf public/assets`, followed by `docker-compose run --rm fabmanager bundle exec rake assets:precompile` - Then restart the web-server or the container. - Finally, to notify all existing users about the change (and send them their migration code/link), run: ```bash diff --git a/lib/tasks/fablab.rake b/lib/tasks/fablab.rake index 907b61713..eaf947e89 100644 --- a/lib/tasks/fablab.rake +++ b/lib/tasks/fablab.rake @@ -207,8 +207,9 @@ namespace :fablab do puts "\n/!\\ WARNING: Please consider the following, otherwise the authentication will be bogus:" puts "\t1) CLEAN the cache with `rake tmp:clear`" - puts "\t2) RESTART the application" - puts "\t3) NOTIFY the current users with `rake fablab:notify_auth_changed`\n\n" + puts "\t2) REBUILD the assets with `rake assets:precompile`" + puts "\t3) RESTART the application" + puts "\t4) NOTIFY the current users with `rake fablab:notify_auth_changed`\n\n" end From a0fef8d046affaab2441cdbc80ed4bd05b6cc755 Mon Sep 17 00:00:00 2001 From: cyril Date: Wed, 28 Sep 2016 13:58:22 +0200 Subject: [PATCH 018/289] bug fix: not to force https in env production for root_url helper --- app/controllers/application_controller.rb | 2 +- .../notifications/_notify_admin_export_complete.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a333e4b71..8d8e8cc66 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -35,7 +35,7 @@ class ApplicationController < ActionController::Base end def default_url_options - Rails.env.production? ? { protocol: 'https' } : {} + { :host => Rails.application.secrets.default_host, protocol: Rails.application.secrets.default_protocol } end def permission_denied diff --git a/app/views/api/notifications/_notify_admin_export_complete.json.jbuilder b/app/views/api/notifications/_notify_admin_export_complete.json.jbuilder index 7c219d70c..02f24df29 100644 --- a/app/views/api/notifications/_notify_admin_export_complete.json.jbuilder +++ b/app/views/api/notifications/_notify_admin_export_complete.json.jbuilder @@ -2,5 +2,5 @@ json.title notification.notification_type json.description t('.export')+' '+ t(".#{notification.attached_object.category}_#{notification.attached_object.export_type}")+' '+ t('.is_over')+' '+ - link_to( t('.download_here'), "#{root_url}api/exports/#{notification.attached_object.id}/download" )+'.' + link_to( t('.download_here'), "api/exports/#{notification.attached_object.id}/download" )+'.' json.url notification_url(notification, format: :json) \ No newline at end of file From 57cb6c4fbe19b0aed1faf1569e018c6eb15318c9 Mon Sep 17 00:00:00 2001 From: cyril Date: Wed, 28 Sep 2016 18:55:40 +0200 Subject: [PATCH 019/289] fix default level_log config --- config/environments/production.rb | 2 +- config/environments/staging.rb | 2 +- config/environments/test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 634bd4a48..5175c8719 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -46,7 +46,7 @@ Rails.application.configure do # config.force_ssl = true # Set to :debug to see everything in the log. - config.log_level = Rails.application.secrets.log_level || :debug + config.log_level = Rails.application.secrets.log_level.blank? ? :debug : Rails.application.secrets.log_level # Prepend all log lines with the following tags. # config.log_tags = [ :subdomain, :uuid ] diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 71a8ceeb6..067ea2d1d 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -46,7 +46,7 @@ Rails.application.configure do # config.force_ssl = true # Set to :debug to see everything in the log. - config.log_level = Rails.application.secrets.log_level || :debug + config.log_level = Rails.application.secrets.log_level.blank? ? :debug : Rails.application.secrets.log_level # Prepend all log lines with the following tags. # config.log_tags = [ :subdomain, :uuid ] diff --git a/config/environments/test.rb b/config/environments/test.rb index c4634c92c..23135c381 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -41,5 +41,5 @@ Rails.application.configure do config.active_support.test_order = :random - config.log_level = Rails.application.secrets.log_level || :debug + config.log_level = Rails.application.secrets.log_level.blank? ? :debug : Rails.application.secrets.log_level end From c2d2786515b0754530f346f1b4ef4015c272e600 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 29 Sep 2016 10:02:31 +0200 Subject: [PATCH 020/289] fix default_host for dev and test environments --- .../controllers/application.coffee.erb | 17 +++++++++-------- config/secrets.yml | 4 ++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/controllers/application.coffee.erb b/app/assets/javascripts/controllers/application.coffee.erb index 043bfbab6..095c50892 100644 --- a/app/assets/javascripts/controllers/application.coffee.erb +++ b/app/assets/javascripts/controllers/application.coffee.erb @@ -23,14 +23,15 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco # @param user {Object} Rails/Devise user ## $scope.setCurrentUser = (user) -> - $rootScope.currentUser = user - Session.create(user); - getNotifications() - # fab-manager's app-version - if user.role == 'admin' - $scope.version = Version.get() - else - $scope.version = {version: ''} + unless angular.isUndefinedOrNull(user) + $rootScope.currentUser = user + Session.create(user); + getNotifications() + # fab-manager's app-version + if user.role == 'admin' + $scope.version = Version.get() + else + $scope.version = {version: ''} ## diff --git a/config/secrets.yml b/config/secrets.yml index 9a835c283..fc6fcaebe 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -17,6 +17,8 @@ development: stripe_currency: <%= ENV["STRIPE_CURRENCY"] %> disqus_shortname: <%= ENV["DISQUS_SHORTNAME"] %> fablab_without_plans: <%= ENV["FABLAB_WITHOUT_PLANS"] %> + default_host: <%= ENV["DEFAULT_HOST"] %> + default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> time_zone: <%= ENV["TIME_ZONE"] %> week_starting_day: <%= ENV["WEEK_STARTING_DAY"] %> d3_date_format: <%= ENV["D3_DATE_FORMAT"].dump %> # .dump is needed as the value may start by a '%', see https://github.com/tenderlove/psych/issues/75 @@ -45,6 +47,8 @@ test: stripe_currency: usd disqus_shortname: fablab-sleede fablab_without_plans: false + default_host: <%= ENV["DEFAULT_HOST"] %> + default_protocol: <%= ENV["DEFAULT_PROTOCOL"] %> time_zone: Paris week_starting_day: monday d3_date_format: '%d/%m/%y' From c6cf40f7ccaf28842ab48c08b56af462f2c5e13a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 29 Sep 2016 10:04:37 +0200 Subject: [PATCH 021/289] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a369f517..703fbf4a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ - Fix a bug: embedded video not working in training/machine description - Fix a bug: reordering project's steps trigger the unsaved-warning dialog - Fix a bug: unable to compile assets in Docker with CoffeeScript error +- Fix a bug: do not force HTTPS for URLs in production environments - [TODO DEPLOY] `rake fablab:es_build_availabilities_index` - [TODO DEPLOY] `rake fablab:es_add_event_filters` - [TODO DEPLOY] `rake db:migrate` From 34ad1c905604368425cedc5c81fbe4dabfeb0f38 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 29 Sep 2016 10:53:20 +0200 Subject: [PATCH 022/289] move RSS code into separate folders --- app/controllers/rss/events_controller.rb | 9 +++++++++ app/controllers/rss/projects_controller.rb | 7 +++++++ app/controllers/rss/rss_controller.rb | 4 ++++ app/views/api/events/index.rss.builder | 21 -------------------- app/views/api/projects/index.rss.builder | 23 ---------------------- app/views/rss/events/index.rss.builder | 22 +++++++++++++++++++++ app/views/rss/projects/index.rss.builder | 23 ++++++++++++++++++++++ config/routes.rb | 7 +++++++ 8 files changed, 72 insertions(+), 44 deletions(-) create mode 100644 app/controllers/rss/events_controller.rb create mode 100644 app/controllers/rss/projects_controller.rb create mode 100644 app/controllers/rss/rss_controller.rb delete mode 100644 app/views/api/events/index.rss.builder delete mode 100644 app/views/api/projects/index.rss.builder create mode 100644 app/views/rss/events/index.rss.builder create mode 100644 app/views/rss/projects/index.rss.builder diff --git a/app/controllers/rss/events_controller.rb b/app/controllers/rss/events_controller.rb new file mode 100644 index 000000000..735a707ec --- /dev/null +++ b/app/controllers/rss/events_controller.rb @@ -0,0 +1,9 @@ +class Rss::EventsController < Rss::RssController + + def index + @events = Event.includes(:event_image, :event_files, :availability, :category) + .where('availabilities.start_at >= ?', Time.now) + .order('availabilities.start_at ASC').references(:availabilities).limit(10) + @fab_name = Setting.find_by(name: 'fablab_name').value + end +end diff --git a/app/controllers/rss/projects_controller.rb b/app/controllers/rss/projects_controller.rb new file mode 100644 index 000000000..75a9736ea --- /dev/null +++ b/app/controllers/rss/projects_controller.rb @@ -0,0 +1,7 @@ +class Rss::ProjectsController < Rss::RssController + + def index + @projects = Project.includes(:project_image, :users).published.order('created_at desc').limit(10) + @fab_name = Setting.find_by(name: 'fablab_name').value + end +end diff --git a/app/controllers/rss/rss_controller.rb b/app/controllers/rss/rss_controller.rb new file mode 100644 index 000000000..d9e32442a --- /dev/null +++ b/app/controllers/rss/rss_controller.rb @@ -0,0 +1,4 @@ +class Rss::RssController < ApplicationController + + +end diff --git a/app/views/api/events/index.rss.builder b/app/views/api/events/index.rss.builder deleted file mode 100644 index b6dff9674..000000000 --- a/app/views/api/events/index.rss.builder +++ /dev/null @@ -1,21 +0,0 @@ -#encoding: UTF-8 - -xml.instruct! :xml, version: "1.0" -xml.rss version: "2.0" do - xml.channel do - xml.title "#{t('app.public.events_list.the_fablab_s_courses_and_workshops')} - #{Setting.find_by(name: 'fablab_name').value}" - xml.author Setting.find_by(name: 'fablab_name').value - xml.link request.base_url + "/#!/events" - xml.language I18n.locale.to_s - - @events.each do |event| - xml.item do - xml.guid event.id - xml.pubDate event.created_at.strftime("%F %T") - xml.title event.name - xml.link request.base_url + "/#!/events/" + event.id.to_s - xml.description event.description - end - end - end -end diff --git a/app/views/api/projects/index.rss.builder b/app/views/api/projects/index.rss.builder deleted file mode 100644 index c9579e36b..000000000 --- a/app/views/api/projects/index.rss.builder +++ /dev/null @@ -1,23 +0,0 @@ -#encoding: UTF-8 - -xml.instruct! :xml, version: "1.0" -xml.rss version: "2.0" do - xml.channel do - xml.title "#{t('app.public.projects_list.the_fablab_projects')} - #{Setting.find_by(name: 'fablab_name').value}" - xml.description t('app.public.projects_list.all_projects') - xml.author Setting.find_by(name: 'fablab_name').value - xml.link request.base_url + "/#!/projects" - xml.language I18n.locale.to_s - - @projects.each do |project| - xml.item do - xml.guid project.id - xml.pubDate project.created_at.strftime("%F %T") - xml.title project.name - xml.link request.base_url + "/#!/projects/" + project.slug - xml.author project.author.first_name - xml.description project.description - end - end - end -end diff --git a/app/views/rss/events/index.rss.builder b/app/views/rss/events/index.rss.builder new file mode 100644 index 000000000..bb5653122 --- /dev/null +++ b/app/views/rss/events/index.rss.builder @@ -0,0 +1,22 @@ +#encoding: UTF-8 + +xml.instruct! :xml, version: '1.0' +xml.rss version: '2.0' do + xml.channel do + xml.title "#{t('app.public.events_list.the_fablab_s_events')} - #{@fab_name}" + xml.description t('app.public.home.fablab_s_next_events') + xml.author @fab_name + xml.link root_url + '#!/events' + xml.language I18n.locale.to_s + + @events.each do |event| + xml.item do + xml.guid event.id + xml.pubDate event.created_at.strftime('%F %T') + xml.title event.name + xml.link root_url + '#!/events/' + event.id.to_s + xml.description event.description + end + end + end +end diff --git a/app/views/rss/projects/index.rss.builder b/app/views/rss/projects/index.rss.builder new file mode 100644 index 000000000..bc7ac0c92 --- /dev/null +++ b/app/views/rss/projects/index.rss.builder @@ -0,0 +1,23 @@ +#encoding: UTF-8 + +xml.instruct! :xml, version: '1.0' +xml.rss version: '2.0' do + xml.channel do + xml.title "#{t('app.public.projects_list.the_fablab_projects')} - #{@fab_name}" + xml.description t('app.public.home.latest_documented_projects') + xml.author @fab_name + xml.link root_url + '#!/projects' + xml.language I18n.locale.to_s + + @projects.each do |project| + xml.item do + xml.guid project.id + xml.pubDate project.created_at.strftime('%F %T') + xml.title project.name + xml.link root_url + '#!/projects/' + project.slug + xml.author project.author.first_name + xml.description project.description + end + end + end +end diff --git a/config/routes.rb b/config/routes.rb index bfcaac9f6..60eeaad7a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -132,6 +132,13 @@ Rails.application.routes.draw do get 'version' => 'version#show' end + # rss + + namespace :rss, as: nil, defaults: { format: :xml } do + resources :projects, only: [:index] + resources :events, only: [:index] + end + # open_api namespace :open_api do From 1ef2c113556077ed6e7bf8835e17d1a2fa1f5a2f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 29 Sep 2016 11:54:08 +0200 Subject: [PATCH 023/289] add links to RSS feeds into application header --- app/assets/templates/projects/index.html.erb | 2 +- app/views/application/index.html.erb | 3 +++ app/views/rss/events/{index.rss.builder => index.xml.builder} | 0 .../rss/projects/{index.rss.builder => index.xml.builder} | 0 config/routes.rb | 4 ++-- 5 files changed, 6 insertions(+), 3 deletions(-) rename app/views/rss/events/{index.rss.builder => index.xml.builder} (100%) rename app/views/rss/projects/{index.rss.builder => index.xml.builder} (100%) diff --git a/app/assets/templates/projects/index.html.erb b/app/assets/templates/projects/index.html.erb index 9e8ccf43a..5baef2d01 100644 --- a/app/assets/templates/projects/index.html.erb +++ b/app/assets/templates/projects/index.html.erb @@ -90,7 +90,7 @@
- +
diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb index 488a7734a..e505d194a 100644 --- a/app/views/application/index.html.erb +++ b/app/views/application/index.html.erb @@ -65,6 +65,9 @@ <% end %> + + + information Not sure if this helps but information does not require an `s`. :) Signed-off-by: Kenneth Lim --- LICENSE.md | 8 ++--- README.md | 32 +++++++++---------- app/assets/javascripts/app.js.erb | 2 +- .../controllers/admin/graphs.coffee | 2 +- .../controllers/admin/invoices.coffee.erb | 6 ++-- .../controllers/machines.coffee.erb | 2 +- .../javascripts/controllers/members.coffee | 12 +++---- .../javascripts/controllers/profile.coffee | 6 ++-- .../controllers/trainings.coffee.erb | 2 +- .../templates/admin/plans/_form.html.erb | 4 +-- app/assets/templates/events/show.html.erb | 2 +- app/assets/templates/plans/index.html.erb | 2 +- .../templates/shared/_member_form.html.erb | 2 +- app/models/user.rb | 2 +- app/pdfs/pdf/invoice.rb | 8 ++--- ...otify_admin_profile_complete.json.jbuilder | 4 +-- ...otify_admin_when_user_is_imported.html.erb | 2 +- config/locales/app.public.en.yml | 4 +-- config/locales/app.public.fr.yml | 6 ++-- config/locales/app.shared.en.yml | 4 +-- config/locales/en.yml | 4 +-- config/locales/mails.en.yml | 2 +- config/locales/mails.fr.yml | 2 +- doc/sso_with_github.md | 22 ++++++------- 24 files changed, 71 insertions(+), 71 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index f2d5d21c0..5cf8fc853 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -39,14 +39,14 @@ Some other used libraries/components are licenced under the terms of the Errors and omissions excepted, the other external libraries used in this project are licenced under the terms of the [MIT Licence](https://opensource.org/licenses/MIT). -Please refer to the libraries documentation for more informations about -their licences. +Please refer to the libraries documentation for more information about +their licences. Complete lists of used libraries are available in `bower.json` for the EcmaScript libraries and in `Gemfile` for Ruby libraries. - + GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 @@ -666,4 +666,4 @@ an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - END OF TERMS AND CONDITIONS \ No newline at end of file + END OF TERMS AND CONDITIONS diff --git a/README.md b/README.md index 743887833..683e1bc60 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,7 @@ This value is only used when deploying with Docker, otherwise this is configured POSTGRES_PASSWORD Password for the PostgreSQL user, as specified in `database.yml`. -Please see [Setup the FabManager database in PostgreSQL](#setup-fabmanager-in-postgresql) for informations on how to create a user and set his password. +Please see [Setup the FabManager database in PostgreSQL](#setup-fabmanager-in-postgresql) for information on how to create a user and set his password. This value is only used when deploying with Docker, otherwise this is configured in `config/database.yml`. REDIS_HOST @@ -222,11 +222,11 @@ Identifier of your Google Analytics account. Unique identifier of your [Disqus](http://www.disqus.com) forum. Disqus forums are used to allow visitors to comment on projects. -See https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname- for more informations. +See https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname- for more information. TWITTER_NAME -Identifier of the Twitter account, from witch the last tweet will be fetched and displayed on the home page. +Identifier of the Twitter account, from witch the last tweet will be fetched and displayed on the home page. It will also be used for [Twitter Card analytics](https://dev.twitter.com/cards/analytics). TWITTER_CONSUMER_KEY, TWITTER_CONSUMER_SECRET, TWITTER_ACCESS_TOKEN & TWITTER_ACCESS_TOKEN_SECRET @@ -241,8 +241,8 @@ If you do so, you'll be able to customize and get statistics about project share LOG_LEVEL -This parameter configures the logs verbosity. -Available log levels can be found [here](http://guides.rubyonrails.org/debugging_rails_applications.html#log-levels). +This parameter configures the logs verbosity. +Available log levels can be found [here](http://guides.rubyonrails.org/debugging_rails_applications.html#log-levels). ALLOWED_EXTENSIONS @@ -361,7 +361,7 @@ To create it, please follow these instructions: ALTER USER sleede WITH ENCRYPTED PASSWORD 'sleede'; ``` 6. Finally, have a look at the [PostgreSQL Limitations](#postgresql-limitations) section or some errors will occurs preventing you from finishing the installation procedure. - + ### PostgreSQL Limitations @@ -370,14 +370,14 @@ To create it, please follow these instructions: So here's your choices, mainly depending on your security requirements: - Use the default PostgreSQL super-user (postgres) as the database user of fab-manager. - Set your user as _SUPERUSER_; run the following command in `psql` (after replacing `sleede` with you user name): - + ```sql ALTER USER sleede WITH SUPERUSER; ``` - - - Install and configure the PostgreSQL extension [pgextwlist](https://github.com/dimitri/pgextwlist). + + - Install and configure the PostgreSQL extension [pgextwlist](https://github.com/dimitri/pgextwlist). Please follow the instructions detailed on the extension website to whitelist `unaccent` and `trigram` for the user configured in `config/database.yml`. -- Some users may want to use another DBMS than PostgreSQL. +- Some users may want to use another DBMS than PostgreSQL. This is currently not supported, because of some PostgreSQL specific instructions that cannot be efficiently handled with the ActiveRecord ORM: - `app/controllers/api/members_controllers.rb@list` is using `ILIKE` - `app/controllers/api/invoices_controllers.rb@list` is using `ILIKE` and `date_trunc()` @@ -386,8 +386,8 @@ To create it, please follow these instructions: - `db/migrate/20150604131525_add_meta_data_to_notifications.rb` is using [jsonb](https://www.postgresql.org/docs/9.4/static/datatype-json.html), a PostgreSQL 9.4+ datatype. - `db/migrate/20160915105234_add_transformation_to_o_auth2_mapping.rb` is using [jsonb](https://www.postgresql.org/docs/9.4/static/datatype-json.html), a PostgreSQL 9.4+ datatype. - If you intend to contribute to the project code, you will need to run the test suite with `rake test`. - This also requires your user to have the _SUPERUSER_ role. - Please see the [known issues](#known-issues) section for more informations about this. + This also requires your user to have the _SUPERUSER_ role. + Please see the [known issues](#known-issues) section for more information about this. ## ElasticSearch @@ -518,7 +518,7 @@ Back-end translations uses the [Ruby on Rails syntax](http://guides.rubyonrails. In each cases, some inline comments are included in the localisation files. They can be recognized as they start with the sharp character (#). -These comments are not required to be translated, they are intended to help the translator to have some context informations about the sentence to translate. +These comments are not required to be translated, they are intended to help the translator to have some context information about the sentence to translate. @@ -652,7 +652,7 @@ Fab-manager can be connected to a [Single Sign-On](https://en.wikipedia.org/wiki Currently OAuth 2 is the only supported protocol for SSO authentication. For an example of how to use configure a SSO in Fab-manager, please read [sso_with_github.md](doc/sso_with_github.md). -Developers may find informations on how to implement their own authentication protocol in [sso_authentication.md](doc/sso_authentication.md). +Developers may find information on how to implement their own authentication protocol in [sso_authentication.md](doc/sso_authentication.md). ## Known issues @@ -692,10 +692,10 @@ Developers may find informations on how to implement their own authentication pr DO NOT do this in a production environment, unless you know what you're doing: this could lead to a serious security issue. -- With Ubuntu 16.04, ElasticSearch may refuse to start even after having configured the service with systemd. +- With Ubuntu 16.04, ElasticSearch may refuse to start even after having configured the service with systemd. To solve this issue, you may have to set `START_DAEMON` to `true` in `/etc/default/elasticsearch`. Then reload ElasticSearch with: - + ```bash sudo systemctl restart elasticsearch.service ``` diff --git a/app/assets/javascripts/app.js.erb b/app/assets/javascripts/app.js.erb index f68dbebb5..d363714d0 100644 --- a/app/assets/javascripts/app.js.erb +++ b/app/assets/javascripts/app.js.erb @@ -71,7 +71,7 @@ config(['$httpProvider', 'AuthProvider', "growlProvider", "unsavedWarningsConfig // Angular-xeditable (click-to-edit elements, used in admin backoffice) editableOptions.theme = 'bs3'; - // Alter the UI-Router's $state, registering into some informations concerning the previous $state. + // Alter the UI-Router's $state, registering into some information concerning the previous $state. // This is used to allow the user to navigate to the previous state $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams){ $state.prevState = fromState; diff --git a/app/assets/javascripts/controllers/admin/graphs.coffee b/app/assets/javascripts/controllers/admin/graphs.coffee index 4e24d1318..b800ab1f9 100644 --- a/app/assets/javascripts/controllers/admin/graphs.coffee +++ b/app/assets/javascripts/controllers/admin/graphs.coffee @@ -217,7 +217,7 @@ Application.Controllers.controller "GraphsController", ["$scope", "$state", "$ro for it_st in [0.. cur_type.subtypes.length-1] by 1 # when we've found it, iterate over its subtypes ... cur_subtype = cur_type.subtypes[it_st] if subgroup.key == cur_subtype.key # ... which match $SUBTYPE - # then we construct NVD3 dataSource according to these informations + # then we construct NVD3 dataSource according to these information dataSource = values: [] key: cur_subtype.label diff --git a/app/assets/javascripts/controllers/admin/invoices.coffee.erb b/app/assets/javascripts/controllers/admin/invoices.coffee.erb index 044e8fd05..b87bb6c83 100644 --- a/app/assets/javascripts/controllers/admin/invoices.coffee.erb +++ b/app/assets/javascripts/controllers/admin/invoices.coffee.erb @@ -125,7 +125,7 @@ Application.Controllers.controller "InvoicesController", ["$scope", "$state", 'I sample = sample.replace(/y+(?![^\[]*])/g, (match, offset, string) -> padWithZeros(8, match.length) ) - # date informations + # date information sample = sample.replace(/[YMD]+(?![^\[]*])/g, (match, offset, string) -> $scope.today.format(match) ) @@ -163,7 +163,7 @@ Application.Controllers.controller "InvoicesController", ["$scope", "$state", 'I sample = sample.replace(/d+(?![^\[]*])/g, (match, offset, string) -> padWithZeros(2, match.length) ) - # date informations + # date information sample = sample.replace(/[YMD]+(?![^\[]*])/g, (match, offset, string) -> $scope.today.format(match) ) @@ -334,7 +334,7 @@ Application.Controllers.controller "InvoicesController", ["$scope", "$state", 'I ## - # Callback to save the value of the legal informations zone when editing is done + # Callback to save the value of the legal information zone when editing is done ## $scope.legalsEditEnd = (event) -> parsed = parseHtml($scope.invoice.legals.content) diff --git a/app/assets/javascripts/controllers/machines.coffee.erb b/app/assets/javascripts/controllers/machines.coffee.erb index 1144abe3f..775dd441a 100644 --- a/app/assets/javascripts/controllers/machines.coffee.erb +++ b/app/assets/javascripts/controllers/machines.coffee.erb @@ -303,7 +303,7 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat ## fullCalendar event. An already booked slot that the user want to modify $scope.slotToModify = null - ## indicates the state of the current view : calendar or plans informations + ## indicates the state of the current view : calendar or plans information $scope.plansAreShown = false ## will store the user's plan if he choosed to buy one diff --git a/app/assets/javascripts/controllers/members.coffee b/app/assets/javascripts/controllers/members.coffee index 440cf5e43..f71b8292c 100644 --- a/app/assets/javascripts/controllers/members.coffee +++ b/app/assets/javascripts/controllers/members.coffee @@ -14,10 +14,10 @@ Application.Controllers.controller "MembersController", ["$scope", 'Member', 'me ### PUBLIC SCOPE ### - + ## currently displayed page of members $scope.page = 1 - + ## members list $scope.members = membersPromise @@ -31,12 +31,12 @@ Application.Controllers.controller "MembersController", ["$scope", 'Member', 'me $scope.showNextMembers = -> $scope.page += 1 Member.query { - requested_attributes:'[profile]', - page: $scope.page, + requested_attributes:'[profile]', + page: $scope.page, size: MEMBERS_PER_PAGE }, (members) -> $scope.members = $scope.members.concat(members) - + if (!members[0] || members[0].maxMembers <= $scope.members.length) $scope.noMoreResults = true @@ -260,7 +260,7 @@ Application.Controllers.controller "EditProfileController", ["$scope", "$rootSco ## Application.Controllers.controller "ShowProfileController", ["$scope", 'memberPromise', 'SocialNetworks', ($scope, memberPromise, SocialNetworks) -> - ## Selected user's informations + ## Selected user's information $scope.user = memberPromise # DEPENDENCY WITH NAVINUM GAMIFICATION PLUGIN !!!! ## List of social networks associated with this user and toggle 'show all' state diff --git a/app/assets/javascripts/controllers/profile.coffee b/app/assets/javascripts/controllers/profile.coffee index c95848ef6..f2f542b31 100644 --- a/app/assets/javascripts/controllers/profile.coffee +++ b/app/assets/javascripts/controllers/profile.coffee @@ -20,13 +20,13 @@ Application.Controllers.controller "CompleteProfileController", ["$scope", "$roo ## name of the current fablab application (eg. "Fablab de la Casemate") $scope.fablabName = settingsPromise.fablab_name - ## informations from the current SSO provider + ## information from the current SSO provider $scope.activeProvider = activeProviderPromise ## list of user's groups (student/standard/...) $scope.groups = groupsPromise - ## current user, contains informations retrieved from the SSO + ## current user, contains information retrieved from the SSO $scope.user = memberPromise ## disallow the user to change his password as he connect from SSO @@ -177,4 +177,4 @@ Application.Controllers.controller "CompleteProfileController", ["$scope", "$roo ## !!! MUST BE CALLED AT THE END of the controller initialize() -] \ No newline at end of file +] diff --git a/app/assets/javascripts/controllers/trainings.coffee.erb b/app/assets/javascripts/controllers/trainings.coffee.erb index d4377c9ab..2c6cdfa39 100644 --- a/app/assets/javascripts/controllers/trainings.coffee.erb +++ b/app/assets/javascripts/controllers/trainings.coffee.erb @@ -109,7 +109,7 @@ Application.Controllers.controller "ReserveTrainingController", ["$scope", "$sta groupObj.plans.push(plan) if plan.group_id == group.id $scope.plansClassifiedByGroup.push(groupObj) - ## indicates the state of the current view : calendar or plans informations + ## indicates the state of the current view : calendar or plans information $scope.plansAreShown = false ## indicates if the selected training was validated (ie. added to the shopping cart) diff --git a/app/assets/templates/admin/plans/_form.html.erb b/app/assets/templates/admin/plans/_form.html.erb index 03d38582d..f68eced4c 100644 --- a/app/assets/templates/admin/plans/_form.html.erb +++ b/app/assets/templates/admin/plans/_form.html.erb @@ -1,4 +1,4 @@ -

{{ 'general_informations' }}

+

{{ 'general_information' }}

@@ -155,4 +155,4 @@ -
\ No newline at end of file +
diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index 9c3c81c8e..5e92b2839 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -68,7 +68,7 @@
-

{{ 'informations_and_booking' }}

+

{{ 'information_and_booking' }}

diff --git a/app/assets/templates/plans/index.html.erb b/app/assets/templates/plans/index.html.erb index 362fb93a3..fc7e37960 100644 --- a/app/assets/templates/plans/index.html.erb +++ b/app/assets/templates/plans/index.html.erb @@ -61,7 +61,7 @@

- {{ 'more_informations' }} + {{ 'more_information' }} diff --git a/app/assets/templates/shared/_member_form.html.erb b/app/assets/templates/shared/_member_form.html.erb index b6c6d278e..f1e4683c6 100644 --- a/app/assets/templates/shared/_member_form.html.erb +++ b/app/assets/templates/shared/_member_form.html.erb @@ -313,7 +313,7 @@
- + User#tap) - # this will init or update the user thanks to the informations retrieved from the SSO + # this will init or update the user thanks to the information retrieved from the SSO user.profile ||= Profile.new auth.info.mapping.each do |key, value| user.set_data_from_sso_mapping(key, value) diff --git a/app/pdfs/pdf/invoice.rb b/app/pdfs/pdf/invoice.rb index de9d6cdf4..db9b951a6 100644 --- a/app/pdfs/pdf/invoice.rb +++ b/app/pdfs/pdf/invoice.rb @@ -27,7 +27,7 @@ module PDF image StringIO.new( Base64.decode64(img_b64.value) ), :fit => [415,40] move_down 20 font('Open-Sans', :size => 10) do - # general informations + # general information if invoice.is_a?(Avoir) text I18n.t('invoices.refund_invoice_reference', REF:invoice.reference), :leading => 3 else @@ -47,7 +47,7 @@ module PDF text I18n.t('invoices.invoice_issued_on_DATE', DATE:I18n.l(invoice.created_at.to_date)) end - # user/organization's informations + # user/organization's information if invoice&.user&.profile&.organization name = invoice.user.profile.organization.name else @@ -261,7 +261,7 @@ module PDF end text payment_verbose - # important informations + # important information move_down 40 txt = parse_html(Setting.find_by({name: 'invoice_text'}).value) txt.each_line do |line| @@ -269,7 +269,7 @@ module PDF end - # address and legals informations + # address and legals information move_down 40 txt = parse_html(Setting.find_by({name: 'invoice_legals'}).value) txt.each_line do |line| diff --git a/app/views/api/notifications/_notify_admin_profile_complete.json.jbuilder b/app/views/api/notifications/_notify_admin_profile_complete.json.jbuilder index 203ffe3a6..d6ed89dc4 100644 --- a/app/views/api/notifications/_notify_admin_profile_complete.json.jbuilder +++ b/app/views/api/notifications/_notify_admin_profile_complete.json.jbuilder @@ -1,5 +1,5 @@ json.title notification.notification_type -json.description t('.account_imported_from_PROVIDER_(UID)_has_completed_its_informations_html', +json.description t('.account_imported_from_PROVIDER_(UID)_has_completed_its_information_html', PROVIDER: notification.attached_object.provider, UID: notification.attached_object.uid) -json.url notification_url(notification, format: :json) \ No newline at end of file +json.url notification_url(notification, format: :json) diff --git a/app/views/notifications_mailer/notify_admin_when_user_is_imported.html.erb b/app/views/notifications_mailer/notify_admin_when_user_is_imported.html.erb index 74e192d4c..eac0434bb 100644 --- a/app/views/notifications_mailer/notify_admin_when_user_is_imported.html.erb +++ b/app/views/notifications_mailer/notify_admin_when_user_is_imported.html.erb @@ -4,7 +4,7 @@

<%= t('.body.new_account_imported', ID: @attached_object.id, PROVIDER: provider.name) %>
<%= t('.body.provider_uid', UID:@attached_object.uid) %>

<% if provider.sso_fields.size > 1 %> -

<%= t('.body.known_informations') %>

+

<%= t('.body.known_information') %>

    <% for field in provider.sso_fields %> <% value = @attached_object.get_data_from_sso_mapping(field) %> diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index 296d8fa3d..e85c74001 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -80,7 +80,7 @@ en: phone_number: "Phone number" phone_number_is_required: "Phone number is required." i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "I authorize FabLab users, registered on the site, to contact me" - i_accept_to_receive_informations_from_the_fablab: "I accept to receive informations from the FabLab" + i_accept_to_receive_information_from_the_fablab: "I accept to receive information from the FabLab" i_ve_read_and_i_accept_: "I've read and I accept" _the_fablab_policy: "the FabLab policy" @@ -200,7 +200,7 @@ en: i_choose_that_plan: "I choose that plan" i_subscribe_online: "I subscribe online" i_already_subscribed: "I already subscribed" - more_informations: "More informations" + more_information: "More information" your_subscription_expires_on_the_DATE: "Your subscription expires on the {{DATE}}" # angular interpolation my_group: "My group" his_group: "{GENDER, select, male{His} female{Her} other{Its}} group" # messageFormat interpolation diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index d1a4420b3..0a3d8b083 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -80,7 +80,7 @@ fr: phone_number: "Numéro de téléphone" phone_number_is_required: "Le numéro de téléphone est requis." i_authorize_Fablab_users_registered_on_the_site_to_contact_me: "J'autorise les utilisateurs du Fab Lab inscrits sur le site à me contacter" - i_accept_to_receive_informations_from_the_fablab: "J'accepte de recevoir des informations du Fab Lab" + i_accept_to_receive_information_from_the_fablab: "J'accepte de recevoir des informations du Fab Lab" i_ve_read_and_i_accept_: "J'ai lu et j'accepte" _the_fablab_policy: "la charte d'utilisation du Fab Lab" @@ -201,7 +201,7 @@ fr: i_choose_that_plan: "Je choisis cette formule" i_subscribe_online: "Je m'abonne en ligne" i_already_subscribed: "Je suis déjà abonné" - more_informations: "Plus d'infos" + more_information: "Plus d'infos" your_subscription_expires_on_the_DATE: "Votre abonnement expire au {{DATE}}" # angular interpolation my_group: "Mon groupe" his_group: "Son groupe" # messageFormat interpolation @@ -228,7 +228,7 @@ fr: # détails d'un événement et réservation event_description: "Description de l'évènement" downloadable_documents: "Documents à télécharger" - informations_and_booking: "Informations et réservation" + information_and_booking: "Informations et réservation" beginning: "Début :" ending: "Fin :" opening_hours: "Horaires :" diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index bcdbc8723..9fc367101 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -199,7 +199,7 @@ en: plan: # subscription plan edition form - general_informations: "General informations" + general_information: "General information" name_length_must_be_less_than_24_characters: "Name length must be less than 24 characters." type_is_required: "Type is required." group: "Group" @@ -368,4 +368,4 @@ en: unable_to_apply_the_coupon_because_expired: "Unable to apply the coupon: this code has expired." unable_to_apply_the_coupon_because_sold_out: "Unable to apply the coupon: this code reached its quota." unable_to_apply_the_coupon_because_already_used: "Unable to apply the coupon: you have already used this code once before." - unable_to_apply_the_coupon_because_rejected: "This code does not exists." \ No newline at end of file + unable_to_apply_the_coupon_because_rejected: "This code does not exists." diff --git a/config/locales/en.yml b/config/locales/en.yml index 87e55c020..f4dec8b83 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -186,7 +186,7 @@ en: notify_admin_member_create_reservation: a_RESERVABLE_reservation_was_made_by_USER_html: "A %{RESERVABLE} reservation was made by %{USER}." notify_admin_profile_complete: - account_imported_from_PROVIDER_(UID)_has_completed_its_informations_html: "Account imported from %{PROVIDER} (%{UID}) has completed its informations." + account_imported_from_PROVIDER_(UID)_has_completed_its_information_html: "Account imported from %{PROVIDER} (%{UID}) has completed its information." notify_admin_slot_is_canceled: USER_s_reservation_on_the_DATE_was_cancelled_remember_to_generate_a_refund_invoice_if_applicable_html: "%{USER}'s reservation, on the %{DATE}, was cancelled. Remember to generate a refund invoice if applicable." notify_admin_slot_is_modified: @@ -320,4 +320,4 @@ en: price_category: # initial price's category for events, created to replace the old "reduced amount" property reduced_fare: "Reduced fare" - reduced_fare_if_you_are_under_25_student_or_unemployed: "Reduced fare if you are under 25, student or unemployed." \ No newline at end of file + reduced_fare_if_you_are_under_25_student_or_unemployed: "Reduced fare if you are under 25, student or unemployed." diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml index e9e2e6071..38140941f 100644 --- a/config/locales/mails.en.yml +++ b/config/locales/mails.en.yml @@ -198,7 +198,7 @@ en: body: new_account_imported: "A new user account (ID: %{ID}) has been imported to the website via %{PROVIDER}." provider_uid: "its provider ID is: " - known_informations: "Here is what we know about this provider:" + known_information: "Here is what we know about this provider:" address_already_used: "This address is already associated with another user" no_more_info_available: "No other info about this user can be provided before he completes his profile." diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index eda12e67d..3efa19f5d 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -198,7 +198,7 @@ fr: body: new_account_imported: "Un nouveau compte utilisateur (ID: %{ID}) vient d'être importé sur la plate-forme via %{PROVIDER}." provider_uid: "Son identifiant fournisseur est %{UID}." - known_informations: "Voici les informations connues à son propos :" + known_information: "Voici les informations connues à son propos :" address_already_used: "Cette adresse est déjà associée à un autre utilisateur" no_more_info_available: "Aucune autre information sur cet utilisateur n'est disponible tant que celui-ci n'aura pas complété son profil." diff --git a/doc/sso_with_github.md b/doc/sso_with_github.md index 2e723592e..0ba007fe7 100644 --- a/doc/sso_with_github.md +++ b/doc/sso_with_github.md @@ -9,13 +9,13 @@ For this guide, we will use [GitHub](https://developer.github.com/v3/oauth/) as Visit https://github.com/settings/applications/new to register your instance. - In `Application name`, we advise you to set the same name as your fab-manager's instance title. - In `Homepage URL`, put the public URL where your fab-manager's instance is located (eg. https://example.com). - - In `Authorization callback URL`, you must specify an URL that will match this scheme: https://example.com/users/auth/oauth2-github/callback + - In `Authorization callback URL`, you must specify an URL that will match this scheme: https://example.com/users/auth/oauth2-github/callback - **example.com** is your own fab-manager's address - - **oauth2-github** match the provider's "strategy name" in the fab-manager. - It is composed of: **SSO's protocol**, _dash_, **slug of the provider's name**. + - **oauth2-github** match the provider's "strategy name" in the fab-manager. + It is composed of: **SSO's protocol**, _dash_, **slug of the provider's name**. If you have a doubt about what it will be, start by creating the authentication provider in your fab-manager (see below), then the strategy's name will be shown in the providers list. - -- You'll be redirected to a page displaying two important informations: your **Client ID** and your **Client Secret**. + +- You'll be redirected to a page displaying two important information: your **Client ID** and your **Client Secret**. - Now go to your fab-manager's instance, login as an administrator, go to `Users management` and `Authentication`. Click `Add a new authentication provider`, and select _OAuth 2.0_ in the `Authentication type` drop-down list. @@ -27,7 +27,7 @@ For this guide, we will use [GitHub](https://developer.github.com/v3/oauth/) as - Fulfill the form with the following parameters: - **Common URL**: `https://github.com/login/oauth/` This is the common part in the URLs of the two following parameters. - **Authorization endpoint**: `authorize` This URL can be found [here](https://developer.github.com/v3/oauth/). - - **Token Acquisition Endpoint**: `access_token` This URL can be found [here](https://developer.github.com/v3/oauth/). + - **Token Acquisition Endpoint**: `access_token` This URL can be found [here](https://developer.github.com/v3/oauth/). - **Profile edition URL**: `https://github.com/settings/profile` This is the URL where you are directed when you click on `Edit profile` in your GitHub dashboard. - **Client identifier**: Your Client ID, collected just before. - **Client secret**: Your Client Secret, collected just before. @@ -40,23 +40,23 @@ For this guide, we will use [GitHub](https://developer.github.com/v3/oauth/) as - **API endpoint URL**: `https://api.github.com/user` Here you can set a complete URL **OR** only an endpoint referring to the previously set **Common URL**. - **API type**: `JSON` Only JSON API are currently supported - **API fields**: `id` According to the GitHub API documentation, this is the name of the JSON field which uniquely identify the user. - - Once you have completed and validated the mapping's line, an information button will be available. + + Once you have completed and validated the mapping's line, an information button will be available. A click on it will show you the type of data expected from the API and, in some cases, you'll be able to configure a transformation. For example, the `Profile.gender` field require a boolean attribute but your API may return strings like `man / woman`. In this case, you'll be able to configure a transformation for `man` <-> `true` and `woman` <-> `false`. - + Now, you are free to map more fields, like `Profile.github` to `html_url`, or `Profile.avatar` to `avatar_url`... - Once you are done, your newly created authentication provider, will be marked as **Pending** in the authentication providers list. To set it as the current active provider, you must open a terminal on the hosting server (and/or container) and run the following commands: - + ```bash # replace GitHub with the name of the provider you just created rake fablab:switch_auth_provider[GitHub] ``` -- As the command just prompted you, you have to re-compile the assets +- As the command just prompted you, you have to re-compile the assets - In development, `rake tmp:clear` will do the job. - In production with Docker, `rm -rf public/assets`, followed by `docker-compose run --rm fabmanager bundle exec rake assets:precompile` - Then restart the web-server or the container. From c500518c28f102c5f7dae039cbfbc6683900be50 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 11 Oct 2016 16:07:34 +0200 Subject: [PATCH 034/289] [bug] sharing project or event w/o image on social network render error 500 --- app/views/social_bot/event.html.erb | 20 ++++++++++++++------ app/views/social_bot/project.html.erb | 20 ++++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/app/views/social_bot/event.html.erb b/app/views/social_bot/event.html.erb index 8fdb64506..1e5e5dcfd 100644 --- a/app/views/social_bot/event.html.erb +++ b/app/views/social_bot/event.html.erb @@ -1,5 +1,9 @@ -<% image = @event.event_image.attachment.medium %> -<% width, height = image.dimensions %> +<% + if @event.event_image + image = @event.event_image.attachment.medium + width, height = image.dimensions + end +%> @@ -9,9 +13,11 @@ - - - + <% if @event.event_image %> + + + + <% end %> @@ -20,7 +26,9 @@ - + <% if @event.event_image %> + + <% end %> \ No newline at end of file diff --git a/app/views/social_bot/project.html.erb b/app/views/social_bot/project.html.erb index 9f94dcd46..15650f83c 100644 --- a/app/views/social_bot/project.html.erb +++ b/app/views/social_bot/project.html.erb @@ -1,5 +1,9 @@ -<% image = @project.project_image.attachment.medium %> -<% width, height = image.dimensions %> +<% + if @project.project_image + image = @project.project_image.attachment.medium + width, height = image.dimensions + end +%> @@ -9,9 +13,11 @@ - - - + <% if @project.project_image %> + + + + <% end %> @@ -20,7 +26,9 @@ - + <% if @project.project_image %> + + <% end %> \ No newline at end of file From e7b03599ce37688656b3d62a59da3d01b21de1f7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 11 Oct 2016 16:09:04 +0200 Subject: [PATCH 035/289] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cc5ba4ca..0a15e7c16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog Fab Manager ## next release +- Fix a bug: unable to share a project/event without image on social networks - Fix a bug: after creating an element in the admin calendar, browsing through the calendar and coming back cause the element to appear duplicated - Fix a bug: after deleting an element in the admin calendar, the confirmation message is wrong and an error is logged in the console - Fix a bug: erroneous syntax in docker env example file From 1bb05da16afc4d9fd1d45e8fb4e60e5c26a4b777 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 11 Oct 2016 16:11:20 +0200 Subject: [PATCH 036/289] Version 2.4.1 --- .fabmanager-version | 2 +- CHANGELOG.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.fabmanager-version b/.fabmanager-version index 197c4d5c2..005119baa 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.0 +2.4.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a15e7c16..44580ae56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog Fab Manager -## next release +## v2.4.1 2016 October 11 + - Fix a bug: unable to share a project/event without image on social networks - Fix a bug: after creating an element in the admin calendar, browsing through the calendar and coming back cause the element to appear duplicated - Fix a bug: after deleting an element in the admin calendar, the confirmation message is wrong and an error is logged in the console From 861980951c86ef5c6579295e68d542ec1eb26ada Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 11 Oct 2016 17:26:48 +0200 Subject: [PATCH 037/289] updated 3rd party libraries licence informations --- LICENSE.md | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 5cf8fc853..3deb50991 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -14,36 +14,39 @@ Copyright (C) 2015 La Casemate along with this program. If not, see . -FabManager uses some external components, which are licenced under the -terms of [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0): +Fab-Manager uses some external components, which are licenced under the +terms of the following licences: -- [jasny-bootstrap](https://github.com/jasny/bootstrap/) -- [elasticsearch](https://github.com/elasticsearch/bower-elasticsearch-js) -- [nvd3](https://github.com/novus/nvd3) -- [angular-bootstrap-switch](https://github.com/frapontillo/angular-bootstrap-switch) -- [elasticsearch-rails](https://github.com/elastic/elasticsearch-rails) -- [elasticsearch-model](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-model) -- [elasticsearch-persistence](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-persistence) -- font [Open Sans](http://www.fontsquirrel.com/fonts/open-sans) +- [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0): + - [jasny-bootstrap](https://github.com/jasny/bootstrap/) + - [elasticsearch](https://github.com/elasticsearch/bower-elasticsearch-js) + - [nvd3](https://github.com/novus/nvd3) + - [angular-bootstrap-switch](https://github.com/frapontillo/angular-bootstrap-switch) + - [elasticsearch-rails](https://github.com/elastic/elasticsearch-rails) + - [elasticsearch-model](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-model) + - [elasticsearch-persistence](https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-persistence) + - font [Open Sans](http://www.fontsquirrel.com/fonts/open-sans) +- [General Public License version 2](http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.en.html): + - [railroady](https://github.com/preston/railroady) + - [unicorn](https://github.com/defunkt/unicorn) + - [prawn](https://github.com/prawnpdf/prawn) + - [prawn-table](https://github.com/prawnpdf/prawn-table) -Some other used libraries/components are licenced under the terms of the -[General Public License version 2](http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.en.html): +- [BSD-2-Clause](https://opensource.org/licenses/BSD-2-Clause) + - [ruby](https://www.ruby-lang.org) + - [rubyzip](https://github.com/rubyzip/rubyzip) + - [byebug](https://github.com/deivid-rodriguez/byebug) -- [ruby](https://www.ruby-lang.org) -- [railroady](https://github.com/preston/railroady) -- [unicorn](https://github.com/defunkt/unicorn) -- [prawn](https://github.com/prawnpdf/prawn) -- [prawn-table](https://github.com/prawnpdf/prawn-table) +- [MIT Licence](https://opensource.org/licenses/MIT) + - Errors and omissions excepted, all the other external libraries used + in this project. - -Errors and omissions excepted, the other external libraries used in this -project are licenced under the terms of the [MIT Licence](https://opensource.org/licenses/MIT). Please refer to the libraries documentation for more information about their licences. Complete lists of used libraries are available in `bower.json` for the -EcmaScript libraries and in `Gemfile` for Ruby libraries. +JS/EcmaScript libraries and in `Gemfile` for Ruby libraries. From 91f70e2c47fe5a6ce791810e9a6d9d0505d25560 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 24 Oct 2016 09:31:29 +0200 Subject: [PATCH 038/289] [bug] statistics graphs not working --- app/assets/javascripts/controllers/admin/graphs.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/controllers/admin/graphs.coffee b/app/assets/javascripts/controllers/admin/graphs.coffee index b800ab1f9..beadfd7c9 100644 --- a/app/assets/javascripts/controllers/admin/graphs.coffee +++ b/app/assets/javascripts/controllers/admin/graphs.coffee @@ -362,6 +362,7 @@ Application.Controllers.controller "GraphsController", ["$scope", "$state", "$ro "index": "stats" "type": esType "searchType": "count" + "stat-type": statType "body": buildElasticAggregationsQuery(statType, $scope.display.interval, moment($scope.datePickerStart.selected), moment($scope.datePickerEnd.selected)) , (error, response) -> if (error) From 1449ca2b82a80fe72d03b3c10fc4f0385706e69e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 24 Oct 2016 09:33:46 +0200 Subject: [PATCH 039/289] updated changelog --- .fabmanager-version | 2 +- CHANGELOG.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.fabmanager-version b/.fabmanager-version index 005119baa..ad8f890b2 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.1 +2.4.2-dev diff --git a/CHANGELOG.md b/CHANGELOG.md index 44580ae56..a4fae451c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog Fab Manager +## next release + +- Fix a bug: statistics graphs were not showing + ## v2.4.1 2016 October 11 - Fix a bug: unable to share a project/event without image on social networks From 42f7b3c75c705779dc1c3aa4d3f40efbe9c56cc5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 26 Oct 2016 16:33:21 +0200 Subject: [PATCH 040/289] add HTML in event description --- CHANGELOG.md | 1 + app/assets/templates/events/_form.html.erb | 11 ++++++++++- app/assets/templates/events/show.html.erb | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4fae451c..2bfda122c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## next release +- Ability to use HTML in event's descriptions using a WYSIWYG editor - Fix a bug: statistics graphs were not showing ## v2.4.1 2016 October 11 diff --git a/app/assets/templates/events/_form.html.erb b/app/assets/templates/events/_form.html.erb index 9d4500b93..b146fffac 100644 --- a/app/assets/templates/events/_form.html.erb +++ b/app/assets/templates/events/_form.html.erb @@ -40,7 +40,16 @@
    - + + + {{ 'description_is_required' }}
    diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index 5e92b2839..6ccf877e7 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -36,7 +36,7 @@

{{ 'event_description' }}

-

+

From f9220d44a00dfe1c37e90b47728cca6e7fea158e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 26 Oct 2016 16:35:10 +0200 Subject: [PATCH 041/289] fix i_accept_to_receive_information_from_the_fablab in sign-up modal --- CHANGELOG.md | 3 ++- app/assets/templates/shared/signupModal.html.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bfda122c..892226aca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ ## next release - Ability to use HTML in event's descriptions using a WYSIWYG editor -- Fix a bug: statistics graphs were not showing +- Fix a bug: statistics graphs were not showing +- In the sign-up modal, the translation for 'i_accept_to_receive_information_from_the_fablab' was not loaded ## v2.4.1 2016 October 11 diff --git a/app/assets/templates/shared/signupModal.html.erb b/app/assets/templates/shared/signupModal.html.erb index a4345f123..778a50c72 100644 --- a/app/assets/templates/shared/signupModal.html.erb +++ b/app/assets/templates/shared/signupModal.html.erb @@ -217,7 +217,7 @@ id="is_allow_newsletter" ng-model="user.is_allow_newsletter" value="true"/> - + From 010fe372213bcace3b1ea9339eaf3a4fabeb16ab Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 27 Oct 2016 11:32:50 +0200 Subject: [PATCH 042/289] forum is preferred channel for feature requests --- CONTRIBUTING.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 775c27bae..3b41e3d93 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,9 +13,8 @@ patches and features. ## Using the issue tracker -The [issue tracker](https://github.com/LaCasemate/fab-manager/issues) is the preferred channel for [bug reports](#bugs), -[features requests](#features) and [submitting pull requests](#pull-requests), but please respect the following -restrictions: +The [issue tracker](https://github.com/LaCasemate/fab-manager/issues) is the preferred channel for [bug reports](#bugs) +and [submitting pull requests](#pull-requests), but please respect the following restrictions: * Please **do not** use the issue tracker for personal support requests (use [the forum](https://forum.fab-manager.com)). @@ -70,6 +69,9 @@ Feature requests are welcome. But take a moment to find out whether your idea fi project. It's up to *you* to make a strong case to convince the project's developers of the merits of this feature. Please provide as much detail and context as possible. +Please note also that [the forum](https://forum.fab-manager.com) is probably a better place for discussing about feature +requests. + ## Pull requests From 84c03a690b360ed0c8b14f3854a57a7aa037dced Mon Sep 17 00:00:00 2001 From: Peng DU Date: Wed, 2 Nov 2016 11:12:23 +0100 Subject: [PATCH 043/289] add padding for summernote editor modal --- app/assets/stylesheets/app.plugins.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/assets/stylesheets/app.plugins.scss b/app/assets/stylesheets/app.plugins.scss index c4f57ebbf..3fde6cde4 100644 --- a/app/assets/stylesheets/app.plugins.scss +++ b/app/assets/stylesheets/app.plugins.scss @@ -15,6 +15,16 @@ .note-editor .note-editable { background-color: white; } +.note-editor { + .form-group { + margin-left: 0px; + margin-right: 0px; + } + + .modal-header { + padding: 15px; + } +} // Growl From ba5e5752a4beeb16fb85bce33295889cbe1f6a24 Mon Sep 17 00:00:00 2001 From: Peng DU Date: Wed, 2 Nov 2016 14:56:35 +0100 Subject: [PATCH 044/289] allow add more picture for project step --- CHANGELOG.md | 1 + .../controllers/projects.coffee.erb | 22 +++++++++++++- app/assets/stylesheets/app.plugins.scss | 4 +++ app/assets/templates/projects/_form.html.erb | 30 ++++++++++++++----- app/assets/templates/projects/show.html.erb | 6 ++-- app/controllers/api/projects_controller.rb | 2 +- app/models/project_step.rb | 4 +-- app/views/api/projects/show.json.jbuilder | 9 ++++-- 8 files changed, 61 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 892226aca..d8de98e09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## next release +- Allow add more picture for project step - Ability to use HTML in event's descriptions using a WYSIWYG editor - Fix a bug: statistics graphs were not showing - In the sign-up modal, the translation for 'i_accept_to_receive_information_from_the_fablab' was not loaded diff --git a/app/assets/javascripts/controllers/projects.coffee.erb b/app/assets/javascripts/controllers/projects.coffee.erb index c34e97e4d..5e7979e74 100644 --- a/app/assets/javascripts/controllers/projects.coffee.erb +++ b/app/assets/javascripts/controllers/projects.coffee.erb @@ -124,7 +124,7 @@ class ProjectsController ## $scope.addStep = -> $scope.totalSteps += 1 - $scope.project.project_steps_attributes.push { step_nb: $scope.totalSteps } + $scope.project.project_steps_attributes.push { step_nb: $scope.totalSteps, project_step_images_attributes: [] } @@ -185,6 +185,26 @@ class ProjectsController console.error(error) + ## + # This will create a single new empty entry into the project's step image list. + ## + $scope.addProjectStepImage = (step)-> + step.project_step_images_attributes.push {} + + + + ## + # This will remove the given image from the project's step image list. + # @param step {Object} the project step has images + # @param image {Object} the image to delete + ## + $scope.deleteProjectStepImage = (step, image) -> + index = step.project_step_images_attributes.indexOf(image) + if image.id? + image._destroy = true + else + step.project_step_images_attributes.splice(index, 1) + ## # Controller used on projects listing page diff --git a/app/assets/stylesheets/app.plugins.scss b/app/assets/stylesheets/app.plugins.scss index 3fde6cde4..af46e9830 100644 --- a/app/assets/stylesheets/app.plugins.scss +++ b/app/assets/stylesheets/app.plugins.scss @@ -24,6 +24,10 @@ .modal-header { padding: 15px; } + + .note-group-select-from-files { + display: none; + } } diff --git a/app/assets/templates/projects/_form.html.erb b/app/assets/templates/projects/_form.html.erb index 94a88a8a8..c77bb0fdf 100644 --- a/app/assets/templates/projects/_form.html.erb +++ b/app/assets/templates/projects/_form.html.erb @@ -100,15 +100,31 @@ -
- {{ 'add_a_picture' | translate }} {{ 'change_the_picture' }} - - {{step.project_step_image}} - +
+
+ + + +
+
+ +
+
+ {{image.attachment}} +
+
+ {{ 'browse' | translate }} {{ 'change' }} + + {{ 'delete' }} +
+
+
+
+ - diff --git a/app/assets/templates/projects/show.html.erb b/app/assets/templates/projects/show.html.erb index 88343e8ed..a6b068803 100644 --- a/app/assets/templates/projects/show.html.erb +++ b/app/assets/templates/projects/show.html.erb @@ -42,10 +42,10 @@

{{ 'step_N' | translate:{INDEX:step.step_nb} }} : {{step.title}}

-
- {{step.title}} +
+ {{image.attachment}}
-
+

diff --git a/app/controllers/api/projects_controller.rb b/app/controllers/api/projects_controller.rb index 6dcc23b7b..aa21f08b8 100644 --- a/app/controllers/api/projects_controller.rb +++ b/app/controllers/api/projects_controller.rb @@ -71,6 +71,6 @@ class API::ProjectsController < API::ApiController user_ids: [], machine_ids: [], component_ids: [], theme_ids: [], project_image_attributes: [:attachment], project_caos_attributes: [:id, :attachment, :_destroy], project_steps_attributes: [:id, :description, :title, :_destroy, :step_nb, - :project_step_image_attributes => :attachment]) + :project_step_images_attributes => [:id, :attachment, :_destroy]]) end end diff --git a/app/models/project_step.rb b/app/models/project_step.rb index 7d12cf85a..eee123c0c 100644 --- a/app/models/project_step.rb +++ b/app/models/project_step.rb @@ -1,5 +1,5 @@ class ProjectStep < ActiveRecord::Base belongs_to :project - has_one :project_step_image, as: :viewable, dependent: :destroy - accepts_nested_attributes_for :project_step_image, allow_destroy: true + has_many :project_step_images, as: :viewable, dependent: :destroy + accepts_nested_attributes_for :project_step_images, allow_destroy: true, reject_if: :all_blank end diff --git a/app/views/api/projects/show.json.jbuilder b/app/views/api/projects/show.json.jbuilder index 3e9cb1d83..fa72c5857 100644 --- a/app/views/api/projects/show.json.jbuilder +++ b/app/views/api/projects/show.json.jbuilder @@ -51,9 +51,12 @@ json.project_steps_attributes @project.project_steps.order('project_steps.step_n json.id s.id json.description s.description json.title s.title - json.project_step_image s.project_step_image.attachment_identifier if s.project_step_image - json.project_step_image_url s.project_step_image.attachment.medium.url if s.project_step_image - json.project_step_full_image_url s.project_step_image.attachment.url if s.project_step_image + json.project_step_images_attributes s.project_step_images do |si| + json.id si.id + json.attachment si.attachment_identifier + json.attachment_url si.attachment.medium.url + json.attachment_full_url si.attachment.url + end json.step_nb s.step_nb end json.state @project.state From f1b749d5f23d07af4651abd086feeba56723090a Mon Sep 17 00:00:00 2001 From: Peng DU Date: Wed, 2 Nov 2016 15:36:22 +0100 Subject: [PATCH 045/289] Image max size is configutable, size by default is 2 megabytes --- CHANGELOG.md | 2 ++ app/models/concerns/image_validator_concern.rb | 7 +++++++ app/models/event_image.rb | 3 +-- app/models/plan_image.rb | 2 +- app/models/project_image.rb | 3 +-- app/models/project_step_image.rb | 3 +-- app/models/user_avatar.rb | 2 +- config/application.yml.default | 3 +++ config/secrets.yml | 4 ++++ docker/env.example | 3 +++ 10 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 app/models/concerns/image_validator_concern.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index d8de98e09..6253c1a3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,12 @@ ## next release +- Image max size is configutable, size by default is 2 megabytes - Allow add more picture for project step - Ability to use HTML in event's descriptions using a WYSIWYG editor - Fix a bug: statistics graphs were not showing - In the sign-up modal, the translation for 'i_accept_to_receive_information_from_the_fablab' was not loaded +- [TODO DEPLOY] add `MAX_IMAGE_SIZE` environment variable in `application.yml` and docker env ## v2.4.1 2016 October 11 diff --git a/app/models/concerns/image_validator_concern.rb b/app/models/concerns/image_validator_concern.rb new file mode 100644 index 000000000..4ba1c56b5 --- /dev/null +++ b/app/models/concerns/image_validator_concern.rb @@ -0,0 +1,7 @@ +module ImageValidatorConcern + extend ActiveSupport::Concern + + included do + validates :attachment, file_size: { maximum: Rails.application.secrets.max_image_size ? Rails.application.secrets.max_image_size.to_i : 2.megabytes.to_i } + end +end diff --git a/app/models/event_image.rb b/app/models/event_image.rb index b76f3ba0d..cd658fed2 100644 --- a/app/models/event_image.rb +++ b/app/models/event_image.rb @@ -1,5 +1,4 @@ class EventImage < Asset + include ImageValidatorConcern mount_uploader :attachment, EventImageUploader - - validates :attachment, file_size: { maximum: 2.megabytes.to_i } end diff --git a/app/models/plan_image.rb b/app/models/plan_image.rb index ab76a0658..24962b1fb 100644 --- a/app/models/plan_image.rb +++ b/app/models/plan_image.rb @@ -1,4 +1,4 @@ class PlanImage < Asset + include ImageValidatorConcern mount_uploader :attachment, PlanImageUploader - validates :attachment, file_size: { maximum: 2.megabytes.to_i } end diff --git a/app/models/project_image.rb b/app/models/project_image.rb index 366b12c1d..7f69a93e0 100644 --- a/app/models/project_image.rb +++ b/app/models/project_image.rb @@ -1,5 +1,4 @@ class ProjectImage < Asset + include ImageValidatorConcern mount_uploader :attachment, ProjectImageUploader - - validates :attachment, file_size: { maximum: 2.megabytes.to_i } end diff --git a/app/models/project_step_image.rb b/app/models/project_step_image.rb index 3e92d49fe..3caabb3c5 100644 --- a/app/models/project_step_image.rb +++ b/app/models/project_step_image.rb @@ -1,5 +1,4 @@ class ProjectStepImage < Asset + include ImageValidatorConcern mount_uploader :attachment, ProjectImageUploader - - validates :attachment, file_size: { maximum: 2.megabytes.to_i } end diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb index 876433b68..0e172a01c 100644 --- a/app/models/user_avatar.rb +++ b/app/models/user_avatar.rb @@ -1,4 +1,4 @@ class UserAvatar < Asset - + include ImageValidatorConcern mount_uploader :attachment, ProfilImageUploader end diff --git a/config/application.yml.default b/config/application.yml.default index c46ee4815..c3a4d9aff 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -59,3 +59,6 @@ LOG_LEVEL: 'debug' ALLOWED_EXTENSIONS: pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps ALLOWED_MIME_TYPES: application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/ application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex + +# 10485760 = 10 megabytes +MAX_IMAGE_SIZE: 10485760 diff --git a/config/secrets.yml b/config/secrets.yml index fc6fcaebe..506a5f190 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -39,6 +39,7 @@ development: log_level: <%= ENV["LOG_LEVEL"] %> facebook_app_id: <%= ENV["FACEBOOK_APP_ID"] %> elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %> + max_image_size: <%= ENV["MAX_IMAGE_SIZE"] %> test: secret_key_base: 83daf5e7b80d990f037407bab78dff9904aaf3c195a50f84fa8695a22287e707dfbd9524b403b1dcf116ae1d8c06844c3d7ed942564e5b46be6ae3ead93a9d30 @@ -69,6 +70,7 @@ test: log_level: <%= ENV["LOG_LEVEL"] %> facebook_app_id: <%= ENV["FACEBOOK_APP_ID"] %> elaticsearch_host: localhost + max_image_size: <%= ENV["MAX_IMAGE_SIZE"] %> staging: secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> @@ -104,6 +106,7 @@ staging: log_level: <%= ENV["LOG_LEVEL"] %> facebook_app_id: <%= ENV["FACEBOOK_APP_ID"] %> elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %> + max_image_size: <%= ENV["MAX_IMAGE_SIZE"] %> # Do not keep production secrets in the repository, # instead read values from the environment. @@ -142,3 +145,4 @@ production: log_level: <%= ENV["LOG_LEVEL"] %> facebook_app_id: <%= ENV["FACEBOOK_APP_ID"] %> elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %> + max_image_size: <%= ENV["MAX_IMAGE_SIZE"] %> diff --git a/docker/env.example b/docker/env.example index ff6493372..36eecc4a1 100644 --- a/docker/env.example +++ b/docker/env.example @@ -60,3 +60,6 @@ LOG_LEVEL=debug ALLOWED_EXTENSIONS=pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps ALLOWED_MIME_TYPES=application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/ application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex + +# 10485760 = 10 megabytes +MAX_IMAGE_SIZE=10485760 From 9dca65786ace49dda890d6b7d5ea3a8f0369257d Mon Sep 17 00:00:00 2001 From: Peng DU Date: Thu, 3 Nov 2016 11:26:01 +0100 Subject: [PATCH 046/289] fix project step images height bug --- app/assets/templates/projects/_form.html.erb | 3 ++- app/assets/templates/projects/show.html.erb | 3 ++- app/views/api/projects/show.json.jbuilder | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/templates/projects/_form.html.erb b/app/assets/templates/projects/_form.html.erb index c77bb0fdf..6d49016e2 100644 --- a/app/assets/templates/projects/_form.html.erb +++ b/app/assets/templates/projects/_form.html.erb @@ -101,7 +101,8 @@
-
+
+
diff --git a/app/assets/templates/projects/show.html.erb b/app/assets/templates/projects/show.html.erb index a6b068803..d93942e04 100644 --- a/app/assets/templates/projects/show.html.erb +++ b/app/assets/templates/projects/show.html.erb @@ -42,7 +42,8 @@

{{ 'step_N' | translate:{INDEX:step.step_nb} }} : {{step.title}}

-
+
+
{{image.attachment}}
diff --git a/app/views/api/projects/show.json.jbuilder b/app/views/api/projects/show.json.jbuilder index fa72c5857..a5fe8fe8f 100644 --- a/app/views/api/projects/show.json.jbuilder +++ b/app/views/api/projects/show.json.jbuilder @@ -51,7 +51,7 @@ json.project_steps_attributes @project.project_steps.order('project_steps.step_n json.id s.id json.description s.description json.title s.title - json.project_step_images_attributes s.project_step_images do |si| + json.project_step_images_attributes s.project_step_images.order('created_at ASC') do |si| json.id si.id json.attachment si.attachment_identifier json.attachment_url si.attachment.medium.url From 99cca406d513bc340a4dc2534ffef7368304d93f Mon Sep 17 00:00:00 2001 From: Peng DU Date: Thu, 3 Nov 2016 12:17:19 +0100 Subject: [PATCH 047/289] fix bug: event date period dant show correct in invoice --- CHANGELOG.md | 1 + app/models/reservation.rb | 6 +++++- .../notify_admin_member_create_reservation.html.erb | 8 +++++++- .../notify_member_create_reservation.html.erb | 8 +++++++- config/locales/rails.fr.yml | 4 ++-- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6253c1a3b..c15ed4cd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## next release +- Fix bug: Event date period dont show correct in invoice - Image max size is configutable, size by default is 2 megabytes - Allow add more picture for project step - Ability to use HTML in event's descriptions using a WYSIWYG editor diff --git a/app/models/reservation.rb b/app/models/reservation.rb index d17a2b98b..61f0713b6 100644 --- a/app/models/reservation.rb +++ b/app/models/reservation.rb @@ -107,7 +107,11 @@ class Reservation < ActiveRecord::Base amount += ticket.booked * ticket.event_price_category.amount end slots.each do |slot| - description = reservable.name + " #{I18n.l slot.start_at, format: :long} - #{I18n.l slot.end_at, format: :hour_minute}" + description = "#{reservable.name} " + (slot.start_at.to_date..slot.end_at.to_date).each do |d| + description += "\n" if slot.start_at.to_date != slot.end_at.to_date + description += "#{I18n.l d, format: :long} #{I18n.l slot.start_at, format: :hour_minute} - #{I18n.l slot.end_at, format: :hour_minute}" + end ii_amount = amount ii_amount = 0 if (slot.offered and on_site) unless on_site diff --git a/app/views/notifications_mailer/notify_admin_member_create_reservation.html.erb b/app/views/notifications_mailer/notify_admin_member_create_reservation.html.erb index f16bc570c..7e1a931f1 100644 --- a/app/views/notifications_mailer/notify_admin_member_create_reservation.html.erb +++ b/app/views/notifications_mailer/notify_admin_member_create_reservation.html.erb @@ -8,6 +8,12 @@

<%= t('.body.reserved_slots') %>

    <% @attached_object.slots.each do |slot| %> -
  • <%= "#{I18n.l slot.start_at, format: :long} - #{I18n.l slot.end_at, format: :hour_minute}" %>
    • + <% if @attached_object.reservable_type == 'Event' %> + <% (slot.start_at.to_date..slot.end_at.to_date).each do |d| %> +
  • <%= "#{I18n.l d, format: :long} #{I18n.l slot.start_at, format: :hour_minute} - #{I18n.l slot.end_at, format: :hour_minute}" %>
    • + <% end %> + <% else %> +
  • <%= "#{I18n.l slot.start_at, format: :long} - #{I18n.l slot.end_at, format: :hour_minute}" %>
    • + <% end %> <% end %>
diff --git a/app/views/notifications_mailer/notify_member_create_reservation.html.erb b/app/views/notifications_mailer/notify_member_create_reservation.html.erb index 793fc5a37..ff507953e 100644 --- a/app/views/notifications_mailer/notify_member_create_reservation.html.erb +++ b/app/views/notifications_mailer/notify_member_create_reservation.html.erb @@ -5,6 +5,12 @@

<%= t('.body.your_reserved_slots') %>

    <% @attached_object.slots.each do |slot| %> -
  • <%= "#{I18n.l slot.start_at, format: :long} - #{I18n.l slot.end_at, format: :hour_minute}" %>
    • + <% if @attached_object.reservable_type == 'Event' %> + <% (slot.start_at.to_date..slot.end_at.to_date).each do |d| %> +
  • <%= "#{I18n.l d, format: :long} #{I18n.l slot.start_at, format: :hour_minute} - #{I18n.l slot.end_at, format: :hour_minute}" %>
    • + <% end %> + <% else %> +
  • <%= "#{I18n.l slot.start_at, format: :long} - #{I18n.l slot.end_at, format: :hour_minute}" %>
    • + <% end %> <% end %>
diff --git a/config/locales/rails.fr.yml b/config/locales/rails.fr.yml index a2952b5f3..802a0e86a 100644 --- a/config/locales/rails.fr.yml +++ b/config/locales/rails.fr.yml @@ -33,7 +33,7 @@ fr: formats: default: "%d/%m/%Y" short: "%e %b" - long: "%e %B %Y" + long: "%A%e %B %Y" month_names: - - janvier @@ -204,4 +204,4 @@ fr: default: "%d %B %Y %Hh %Mmin %Ss" long: "%A %d %B %Y %Hh%M" short: "%d %b %Hh%M" - pm: pm \ No newline at end of file + pm: pm From 7c328af3578eef888cf1ccee32dc5c8380be6ee8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 8 Nov 2016 16:24:34 +0100 Subject: [PATCH 048/289] Version 2.4.2 --- .fabmanager-version | 2 +- CHANGELOG.md | 10 +++++----- README.md | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.fabmanager-version b/.fabmanager-version index ad8f890b2..8e8299dcc 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.2-dev +2.4.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index c15ed4cd6..f846aa178 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,13 @@ # Changelog Fab Manager -## next release +## v2.4.2 2016 November 8 -- Fix bug: Event date period dont show correct in invoice -- Image max size is configutable, size by default is 2 megabytes -- Allow add more picture for project step +- Image max size is configurable, default size is 2 megabytes +- Allow add more pictures for project step - Ability to use HTML in event's descriptions using a WYSIWYG editor - Fix a bug: statistics graphs were not showing -- In the sign-up modal, the translation for 'i_accept_to_receive_information_from_the_fablab' was not loaded +- Fix a bug: On invoices, only starting date is shown for multi-days events +- Fix a bug: In the sign-up modal, the translation for 'i_accept_to_receive_information_from_the_fablab' was not loaded - [TODO DEPLOY] add `MAX_IMAGE_SIZE` environment variable in `application.yml` and docker env ## v2.4.1 2016 October 11 diff --git a/README.md b/README.md index 683e1bc60..da7d6562d 100644 --- a/README.md +++ b/README.md @@ -258,6 +258,12 @@ Each item in the list must be separated from the others by a space char. You will probably want to check that this list match the `ALLOWED_EXTENSIONS` values above. Please consider that allowing file archives (eg. application/zip) or binary executable (eg. application/exe) may result in a **dangerous** security issue and must be avoided in any cases. + MAX_IMAGE_SIZE + +Maximum size (in bytes) allowed for image uploaded on the platform. +This parameter concerns events, plans, user's avatars, projects and steps of projects. +If this parameter is not specified the maximum size allowed will be 2MB. + Settings related to Open Projects See the [Open Projects](#open-projects) section for a detailed description of these parameters. From db280ce6d81d5ce23c962765adc1b32bb77ad22e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 9 Nov 2016 13:05:26 +0100 Subject: [PATCH 049/289] fix application startup warnings: Use strings for Figaro configuration --- config/application.yml.default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/application.yml.default b/config/application.yml.default index c3a4d9aff..4aed18a73 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -20,7 +20,7 @@ DEFAULT_HOST: fab-manager.com DEFAULT_PROTOCOL: https DELIVERY_METHOD: smtp SMTP_ADDRESS: -SMTP_PORT: 587 +SMTP_PORT: '587' SMTP_USER_NAME: SMTP_PASSWORD: GA_ID: '' @@ -61,4 +61,4 @@ ALLOWED_EXTENSIONS: pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3d ALLOWED_MIME_TYPES: application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/ application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex # 10485760 = 10 megabytes -MAX_IMAGE_SIZE: 10485760 +MAX_IMAGE_SIZE: '10485760' From 2dcd980be303fc1a2c6aff3c6683360ee7c5cbaf Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 9 Nov 2016 13:12:30 +0100 Subject: [PATCH 050/289] [bug] recurrent events doesn't have the configured theme and age range --- app/models/event.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/event.rb b/app/models/event.rb index 95181599b..8a87b360e 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -108,6 +108,8 @@ class Event < ActiveRecord::Base availability: Availability.new(start_at: start_at, end_at: end_at, available_type: 'event'), availability_id: nil, category_id: category_id, + age_range_id: age_range_id, + event_themes: event_themes, amount: amount, event_price_categories: event_price_cats, nb_total_places: nb_total_places, From d5a5b6dd29763e5e0bb92d33f30de4b3fc50fe8a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 9 Nov 2016 13:14:53 +0100 Subject: [PATCH 051/289] updated changelog --- .fabmanager-version | 2 +- CHANGELOG.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.fabmanager-version b/.fabmanager-version index 8e8299dcc..6cdfe8db7 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.2 +2.4.3-dev diff --git a/CHANGELOG.md b/CHANGELOG.md index f846aa178..a6324d331 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog Fab Manager +## next release + +- Fix a bug: later occurrences of recurrent events does not have the initially configured theme and age range + ## v2.4.2 2016 November 8 - Image max size is configurable, default size is 2 megabytes From c04ed51f857fa780be705f1c547540c5388a3653 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 9 Nov 2016 14:35:02 +0100 Subject: [PATCH 052/289] [bug] translation conflict --- app/assets/templates/admin/events/reservations.html.erb | 2 +- config/locales/app.admin.en.yml | 2 +- config/locales/app.admin.fr.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/templates/admin/events/reservations.html.erb b/app/assets/templates/admin/events/reservations.html.erb index 45d4c47a8..a4867fee9 100644 --- a/app/assets/templates/admin/events/reservations.html.erb +++ b/app/assets/templates/admin/events/reservations.html.erb @@ -7,7 +7,7 @@
-

{{ 'reservations' | translate }} {{event.title}}

+

{{ 'the_reservations' | translate }} {{event.title}}

diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 570833c41..d99c75287 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -123,7 +123,7 @@ en: event_reservations: # event reservations list - reservations: "Reservations :" + the_reservations: "Reservations :" payment_date: "Payment date" reserved_tickets: "Reserved tickets" show_the_event: "Show the event" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 8200c6990..d054fb385 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -123,7 +123,7 @@ fr: event_reservations: # liste des réservations sur un évènement - reservations: "Les réservations :" + the_reservations: "Les réservations :" payment_date: "Date de paiement" reserved_tickets: "Places réservées" show_the_event: "Afficher l'évènement" From a80df7f993b83a59549120d7b43d2113efc5a3e5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 9 Nov 2016 14:36:28 +0100 Subject: [PATCH 053/289] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6324d331..8ff7531a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## next release +- Fix a bug: conflict between similar translations around "reservations" - Fix a bug: later occurrences of recurrent events does not have the initially configured theme and age range ## v2.4.2 2016 November 8 From da71ba783c6b2ab35d6d5fc4ea7afe76450079c3 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 9 Nov 2016 15:01:41 +0100 Subject: [PATCH 054/289] [bug] exports for events reservation always have seats=1 (fixes #54) --- CHANGELOG.md | 2 ++ app/controllers/api/exports_controller.rb | 6 +++++- app/views/exports/users_reservations.xlsx.axlsx | 2 +- config/locales/en.yml | 1 + config/locales/fr.yml | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ff7531a5..b87e5a735 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,10 @@ ## next release +- Fix a bug: number of reserved seats for an event is always of 1 in the excel export of reservations - Fix a bug: conflict between similar translations around "reservations" - Fix a bug: later occurrences of recurrent events does not have the initially configured theme and age range +- [TODO DEPLOY] delete the `exports/users/reservations` folder to prevent the usage of old invalid exports ## v2.4.2 2016 November 8 diff --git a/app/controllers/api/exports_controller.rb b/app/controllers/api/exports_controller.rb index 0ec8dff1c..69a204d99 100644 --- a/app/controllers/api/exports_controller.rb +++ b/app/controllers/api/exports_controller.rb @@ -5,7 +5,11 @@ class API::ExportsController < API::ApiController def download authorize @export - send_file File.join(Rails.root, @export.file), :type => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', :disposition => 'attachment' + if FileTest.exist?(@export.file) + send_file File.join(Rails.root, @export.file), :type => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', :disposition => 'attachment' + else + render text: I18n.t('errors.messages.export_not_found'), status: :not_found + end end def status diff --git a/app/views/exports/users_reservations.xlsx.axlsx b/app/views/exports/users_reservations.xlsx.axlsx index 54bbb0e90..98a56b8c4 100644 --- a/app/views/exports/users_reservations.xlsx.axlsx +++ b/app/views/exports/users_reservations.xlsx.axlsx @@ -21,7 +21,7 @@ wb.add_worksheet(name: t('export_reservations.reservations')) do |sheet| resrv.created_at.to_date, resrv.reservable_type, (resrv.reservable.nil? ? '' : resrv.reservable.name), - resrv.slots.count, + (resrv.reservable_type == 'Event') ? resrv.total_booked_seats: resrv.slots.count, (resrv.stp_invoice_id.nil?)? t('export_reservations.local_payment') : t('export_reservations.online_payment') ] styles = [nil, nil, nil, date, nil, nil, nil, nil] diff --git a/config/locales/en.yml b/config/locales/en.yml index f4dec8b83..557404a50 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -31,6 +31,7 @@ en: wrong_size: "is the wrong size (should be %{file_size})" size_too_small: "is too small (should be at least %{file_size})" size_too_big: "is too big (should be at most %{file_size})" + export_not_found: "Requested export was not found. It was probably deleted, please generate a new export." activemodel: errors: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 1b6629cc1..cd3fb70bb 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -31,6 +31,7 @@ fr: wrong_size: "ne fait pas la taille du fichier (doit comporter %{file_size})" size_too_small: "est trop petite (au moins %{file_size})" size_too_big: "est trop grande (pas plus de %{file_size})" + export_not_found: "L'export demandé n'a pas été trouvé. Il a probablement été supprimé, veuillez lancer la génération d'un nouvel export." activemodel: errors: From d46e6cf9c9aecc8aff2335c4bf648e7f9f8442d7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Nov 2016 15:08:24 +0100 Subject: [PATCH 055/289] [members excel export] invoicing disabled --- CHANGELOG.md | 1 + app/views/exports/users_members.xlsx.axlsx | 89 +++++++++++++--------- config/locales/en.yml | 1 + config/locales/fr.yml | 1 + 4 files changed, 56 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b87e5a735..6d4da1cee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## next release +- Export user's invoicing status in members' excel export - Fix a bug: number of reserved seats for an event is always of 1 in the excel export of reservations - Fix a bug: conflict between similar translations around "reservations" - Fix a bug: later occurrences of recurrent events does not have the initially configured theme and age range diff --git a/app/views/exports/users_members.xlsx.axlsx b/app/views/exports/users_members.xlsx.axlsx index 3888a9b5d..374b5c79f 100644 --- a/app/views/exports/users_members.xlsx.axlsx +++ b/app/views/exports/users_members.xlsx.axlsx @@ -7,51 +7,68 @@ wb.add_worksheet(name: t('export_members.members')) do |sheet| ## data table # heading labels - columns = [t('export_members.id'), t('export_members.surname'), t('export_members.first_name'), t('export_members.email'), - t('export_members.newsletter'), t('export_members.gender'), t('export_members.age'), t('export_members.address'), t('export_members.phone'), - t('export_members.website'), t('export_members.job'), t('export_members.interests'), - t('export_members.cad_software_mastered'), t('export_members.group'), t('export_members.subscription'), - t('export_members.subscription_end_date'), t('export_members.validated_trainings'), t('export_members.tags'), - t('export_members.number_of_invoices'), t('export_members.projects'), t('export_members.facebook'), - t('export_members.twitter'), t('export_members.echo_sciences'), - t('export_members.organization'), t('export_members.organization_address')] + columns = [t('export_members.id'), + t('export_members.surname'), + t('export_members.first_name'), + t('export_members.email'), + t('export_members.newsletter'), + t('export_members.gender'), + t('export_members.age'), + t('export_members.address'), + t('export_members.phone'), + t('export_members.website'), + t('export_members.job'), + t('export_members.interests'), + t('export_members.cad_software_mastered'), + t('export_members.group'), + t('export_members.subscription'), + t('export_members.subscription_end_date'), + t('export_members.validated_trainings'), + t('export_members.tags'), + t('export_members.number_of_invoices'), + t('export_members.invoicing_disabled'), + t('export_members.projects'), + t('export_members.facebook'), + t('export_members.twitter'), + t('export_members.echo_sciences'), + t('export_members.organization'), + t('export_members.organization_address')] sheet.add_row columns, :style => header # data rows @members.each do |member| data = [ - member.id, member.profile.last_name, member.profile.first_name, - member.email, member.is_allow_newsletter, member.profile.gender ? t('export_members.man') : t('export_members.woman'), member.profile.age, - member.profile.address ? member.profile.address.address : '', member.profile.phone, member.profile.website, - member.profile.job, member.profile.interest, member.profile.software_mastered, member.group.name, + member.id, + member.profile.last_name, + member.profile.first_name, + member.email, + member.is_allow_newsletter, + member.profile.gender ? t('export_members.man') : t('export_members.woman'), + member.profile.age, + member.profile.address ? member.profile.address.address : '', + member.profile.phone, + member.profile.website, + member.profile.job, + member.profile.interest, + member.profile.software_mastered, + member.group.name, (member.subscription and member.subscription.expired_at > Time.now) ? member.subscription.plan.name : t('export_members.without_subscriptions'), (member.subscription and member.subscription.expired_at > Time.now) ? member.subscription.expired_at.to_date : nil, - member.trainings.map(&:name).join("\n"), member.tags.map(&:name).join("\n"), member.invoices.size, - member.projects.map(&:name).join("\n"), member.profile.facebook || '', member.profile.twitter || '', + member.trainings.map(&:name).join("\n"), + member.tags.map(&:name).join("\n"), + member.invoices.size, + member.invoicing_disabled, + member.projects.map(&:name).join("\n"), + member.profile.facebook || '', + member.profile.twitter || '', member.profile.echosciences || '', - member.profile.organization ? member.profile.organization.name : '', member.profile.organization ? member.profile.organization.address.address : '' + member.profile.organization ? member.profile.organization.name : '', + member.profile.organization ? member.profile.organization.address.address : '' ] - styles = [nil, nil, nil, - nil, nil, nil, nil, - nil, nil, nil, - nil, nil, nil, nil, - nil, - date, - nil, nil, nil, - nil, nil, nil, - nil, - nil, nil - ] - types = [:integer, :string, :string, - :string, :boolean, :string, :integer, - :string, :string, :string, - :string, :string, :string, :string, - :string, - :date, - :string, :string, :integer, - :string, :string, :string, - :string, - :string, :string] + styles = [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, date, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil] + + types = [:integer, :string, :string, :string, :boolean, :string, :integer, :string, :string, :string, :string, :string, + :string, :string, :string, :date, :string, :string, :integer, :boolean, :string, :string, :string, :string, :string, :string] sheet.add_row data, :style => styles, :types => types end diff --git a/config/locales/en.yml b/config/locales/en.yml index 557404a50..cb4689a00 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -138,6 +138,7 @@ en: validated_trainings: "Validated trainings" tags: "Tags" number_of_invoices: "Number of invoices" + invoicing_disabled: "Invoicing disabled" projects: "Projects" facebook: "Facebook" twitter: "Twitter" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index cd3fb70bb..bef046965 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -138,6 +138,7 @@ fr: validated_trainings: "Formations validées" tags: "Étiquettes" number_of_invoices: "Nombre de factures" + invoicing_disabled: "Facturation désactivée" projects: "Projets" facebook: "Facebook" twitter: "Twitter" From 38653d22d1a17c5ca113a8f922b2f9aaf5a20158 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Nov 2016 16:55:56 +0100 Subject: [PATCH 056/289] fix events description on the home page --- CHANGELOG.md | 1 + app/assets/templates/home.html.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d4da1cee..332b5be09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## next release - Export user's invoicing status in members' excel export +- Fix a bug: Next events descriptions, shown on the home page, display raw html - Fix a bug: number of reserved seats for an event is always of 1 in the excel export of reservations - Fix a bug: conflict between similar translations around "reservations" - Fix a bug: later occurrences of recurrent events does not have the initially configured theme and age range diff --git a/app/assets/templates/home.html.erb b/app/assets/templates/home.html.erb index 1e08bdcfd..d851693ab 100644 --- a/app/assets/templates/home.html.erb +++ b/app/assets/templates/home.html.erb @@ -100,7 +100,7 @@ {{event.category.name}}
-

{{event.description | humanize : 500 }}

+

From 6c9fdaaf8344a0196f516c4914ba9aec77e5e360 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 21 Nov 2016 11:35:56 +0100 Subject: [PATCH 057/289] [bug] fix machine hours stats graph --- app/assets/javascripts/controllers/admin/graphs.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/controllers/admin/graphs.coffee b/app/assets/javascripts/controllers/admin/graphs.coffee index beadfd7c9..8c23e69c7 100644 --- a/app/assets/javascripts/controllers/admin/graphs.coffee +++ b/app/assets/javascripts/controllers/admin/graphs.coffee @@ -363,6 +363,8 @@ Application.Controllers.controller "GraphsController", ["$scope", "$state", "$ro "type": esType "searchType": "count" "stat-type": statType + "start-date": moment($scope.datePickerStart.selected).format() + "end-date": moment($scope.datePickerEnd.selected).format() "body": buildElasticAggregationsQuery(statType, $scope.display.interval, moment($scope.datePickerStart.selected), moment($scope.datePickerEnd.selected)) , (error, response) -> if (error) From 52ad1b2c13b291d5d5757916b556a18055474392 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 21 Nov 2016 11:45:48 +0100 Subject: [PATCH 058/289] fix trainings, users, events graphs --- app/controllers/api/statistics_controller.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/controllers/api/statistics_controller.rb b/app/controllers/api/statistics_controller.rb index 147d2c181..b22e6caf7 100644 --- a/app/controllers/api/statistics_controller.rb +++ b/app/controllers/api/statistics_controller.rb @@ -15,19 +15,20 @@ class API::StatisticsController < API::ApiController statistic_type = request.query_parameters.delete('stat-type') start_date = request.query_parameters.delete('start-date') end_date = request.query_parameters.delete('end-date') - puts start_date, end_date # run main query in elasticSearch query = MultiJson.load(request.body.read) results = Stats::#{path.classify}.search(query, request.query_parameters.symbolize_keys).response # run additional custom aggregations, if any - stat_index = StatisticIndex.find_by_es_type_key("#{path}") - stat_type = StatisticType.where(statistic_index_id: stat_index.id, key: statistic_type).first - client = Elasticsearch::Model.client - stat_type.statistic_custom_aggregations.each do |custom| - c_res = client.search index: custom.es_index, type:custom.es_type, body:sprintf(custom.query, {aggs_name: custom.field, start_date: start_date, end_date: end_date}) - results['aggregations'][custom.field] = c_res['aggregations'][custom.field] + if statistic_type and start_date and end_date + stat_index = StatisticIndex.find_by_es_type_key("#{path}") + stat_type = StatisticType.where(statistic_index_id: stat_index.id, key: statistic_type).first + client = Elasticsearch::Model.client + stat_type.statistic_custom_aggregations.each do |custom| + c_res = client.search index: custom.es_index, type:custom.es_type, body:sprintf(custom.query, {aggs_name: custom.field, start_date: start_date, end_date: end_date}) + results['aggregations'][custom.field] = c_res['aggregations'][custom.field] + end end # return result From e38afc0d4b51890526516bc6d79082b691eea4ba Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 21 Nov 2016 12:00:03 +0100 Subject: [PATCH 059/289] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 332b5be09..c394cba2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fix a bug: number of reserved seats for an event is always of 1 in the excel export of reservations - Fix a bug: conflict between similar translations around "reservations" - Fix a bug: later occurrences of recurrent events does not have the initially configured theme and age range +- Fix a bug: some graphs do not display: events, users, trainings and machine hours - [TODO DEPLOY] delete the `exports/users/reservations` folder to prevent the usage of old invalid exports ## v2.4.2 2016 November 8 From 1747157c6b3391ef9f089082815d2c7565873714 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 21 Nov 2016 14:16:55 +0100 Subject: [PATCH 060/289] Version 2.4.3 --- .fabmanager-version | 2 +- CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.fabmanager-version b/.fabmanager-version index 6cdfe8db7..35cee72dc 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.3-dev +2.4.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index c394cba2c..8b2a2d826 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog Fab Manager -## next release +## v2.4.3 2016 November 21 - Export user's invoicing status in members' excel export - Fix a bug: Next events descriptions, shown on the home page, display raw html From 327a6eab1181141a047dad80f95238e15f416dd6 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 21 Nov 2016 15:00:34 +0100 Subject: [PATCH 061/289] fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da7d6562d..fb6d7023c 100644 --- a/README.md +++ b/README.md @@ -677,7 +677,7 @@ Developers may find information on how to implement their own authentication pro To solve this issue copy `config/application.yml.default` to `config/application.yml`. This is required before the first start. -- Due to a stripe limitation, you won't be ble to create plans longer than one year. +- Due to a stripe limitation, you won't be able to create plans longer than one year. - When running the tests suite with `rake test`, all tests may fail with errors similar to the following: From 42f1213af73b56de18d07bf0e94cf73a8390140b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 23 Nov 2016 11:32:22 +0100 Subject: [PATCH 062/289] update documentation schemas --- doc/controllers_brief.svg | 120 ++-- doc/controllers_complete.svg | 1154 ++++++++++++++++++---------------- doc/models_brief.svg | 700 ++++++++++----------- doc/models_complete.svg | 991 ++++++++++++++--------------- 4 files changed, 1513 insertions(+), 1452 deletions(-) diff --git a/doc/controllers_brief.svg b/doc/controllers_brief.svg index 433767080..096ed4773 100644 --- a/doc/controllers_brief.svg +++ b/doc/controllers_brief.svg @@ -4,23 +4,23 @@ - - + + controllers_diagram - + _diagram_info Controllers diagram -Date: Sep 15 2016 - 17:48 -Migration version: 20160915105234 +Date: Nov 23 2016 - 10:21 +Migration version: 20160922155555 Generated by RailRoady 1.4.0 http://railroady.prestonlee.com SessionsController - -SessionsController + +SessionsController OpenAPI::V1::BookableMachinesController @@ -74,8 +74,8 @@ API::TagsController - -API::TagsController + +API::TagsController API::StatisticsController @@ -89,8 +89,8 @@ API::PlansController - -API::PlansController + +API::PlansController API::AuthProvidersController @@ -144,8 +144,8 @@ API::FeedsController - -API::FeedsController + +API::FeedsController API::MembersController @@ -154,8 +154,8 @@ API::PricesController - -API::PricesController + +API::PricesController API::TranslationsController @@ -209,96 +209,116 @@ API::SlotsController - -API::SlotsController + +API::SlotsController + + +API::VersionController + +API::VersionController -API::AdminsController +API::AdminsController API::AdminsController -API::GroupsController - -API::GroupsController +API::GroupsController + +API::GroupsController -API::AvailabilitiesController +API::AvailabilitiesController API::AvailabilitiesController -API::UsersController - -API::UsersController +API::UsersController + +API::UsersController -API::ProjectsController +API::ProjectsController API::ProjectsController -API::WalletController - -API::WalletController +API::WalletController + +API::WalletController -API::NotificationsController +API::NotificationsController API::NotificationsController -API::TrainingsController +API::TrainingsController API::TrainingsController -API::SettingsController +API::SettingsController API::SettingsController -API::OpenAPIClientsController +API::OpenAPIClientsController API::OpenAPIClientsController -API::InvoicesController +API::InvoicesController API::InvoicesController -API::LicencesController +API::LicencesController API::LicencesController -SocialBotController - -SocialBotController +SocialBotController + +SocialBotController -PasswordsController - -PasswordsController +PasswordsController + +PasswordsController -ApplicationController - -ApplicationController +ApplicationController + +ApplicationController -Users::OmniauthCallbacksController +Users::OmniauthCallbacksController Users::OmniauthCallbacksController -WebhooksController - -WebhooksController +WebhooksController + +WebhooksController + + +Rss::RssController + +Rss::RssController + + +Rss::EventsController + +Rss::EventsController + + +Rss::ProjectsController + +Rss::ProjectsController -ConfirmationsController +ConfirmationsController ConfirmationsController diff --git a/doc/controllers_complete.svg b/doc/controllers_complete.svg index 0421faae8..c6d866231 100644 --- a/doc/controllers_complete.svg +++ b/doc/controllers_complete.svg @@ -4,158 +4,158 @@ - - + + controllers_diagram - + _diagram_info -Controllers diagram -Date: Sep 15 2016 - 17:48 -Migration version: 20160915105234 -Generated by RailRoady 1.4.0 -http://railroady.prestonlee.com +Controllers diagram +Date: Nov 23 2016 - 10:21 +Migration version: 20160922155555 +Generated by RailRoady 1.4.0 +http://railroady.prestonlee.com SessionsController - -SessionsController - -new - -set_csrf_headers - -_layout + +SessionsController + +new + +set_csrf_headers + +_layout OpenAPI::V1::BookableMachinesController - -OpenAPI::V1::BookableMachinesController - -index - - -_layout + +OpenAPI::V1::BookableMachinesController + +index + + +_layout OpenAPI::V1::ReservationsController - -OpenAPI::V1::ReservationsController - -index - - -_layout -format_type -per_page + +OpenAPI::V1::ReservationsController + +index + + +_layout +format_type +per_page OpenAPI::V1::EventsController - -OpenAPI::V1::EventsController - -index - - -_layout -per_page + +OpenAPI::V1::EventsController + +index + + +_layout +per_page OpenAPI::V1::MachinesController - -OpenAPI::V1::MachinesController - -index - - -_layout + +OpenAPI::V1::MachinesController + +index + + +_layout OpenAPI::V1::UserTrainingsController - -OpenAPI::V1::UserTrainingsController - -index - - -_layout -per_page + +OpenAPI::V1::UserTrainingsController + +index + + +_layout +per_page OpenAPI::V1::BaseController - -OpenAPI::V1::BaseController - - -authenticate -authenticate_token -bad_request -current_api_client -not_found -render_unauthorized - -_layout -increment_calls_count + +OpenAPI::V1::BaseController + + +authenticate +authenticate_token +bad_request +current_api_client +not_found +render_unauthorized + +_layout +increment_calls_count OpenAPI::V1::UsersController - -OpenAPI::V1::UsersController - -index - - -_layout -per_page + +OpenAPI::V1::UsersController + +index + + +_layout +per_page OpenAPI::V1::TrainingsController - -OpenAPI::V1::TrainingsController - -index - - -_layout + +OpenAPI::V1::TrainingsController + +index + + +_layout OpenAPI::V1::InvoicesController - -OpenAPI::V1::InvoicesController - -download -index - - -_layout -per_page + +OpenAPI::V1::InvoicesController + +download +index + + +_layout +per_page RegistrationsController - -RegistrationsController - -create - - -_layout + +RegistrationsController + +create + + +_layout API::TagsController - -API::TagsController - -create -destroy -index -show -update - - -_layout -set_tag -tag_params + +API::TagsController + +create +destroy +index +show +update + + +_layout +set_tag +tag_params API::StatisticsController @@ -185,30 +185,30 @@ API::TrainingsPricingsController - -API::TrainingsPricingsController - -index -trainings_pricing_params -update - - -_layout + +API::TrainingsPricingsController + +index +trainings_pricing_params +update + + +_layout API::PlansController - -API::PlansController - -create -destroy -index -show -update - - -_layout -plan_params + +API::PlansController + +create +destroy +index +show +update + + +_layout +plan_params API::AuthProvidersController @@ -230,144 +230,144 @@ API::CouponsController - -API::CouponsController - -create -destroy -index -send_to -show -update -validate - - -_layout -coupon_editable_params -coupon_params -set_coupon + +API::CouponsController + +create +destroy +index +send_to +show +update +validate + + +_layout +coupon_editable_params +coupon_params +set_coupon API::AgeRangesController - -API::AgeRangesController - -create -destroy -index -show -update - - -_layout -age_range_params -set_age_range + +API::AgeRangesController + +create +destroy +index +show +update + + +_layout +age_range_params +set_age_range API::CreditsController - -API::CreditsController - -create -destroy -index -update - - -_layout -credit_params -set_credit + +API::CreditsController + +create +destroy +index +update + + +_layout +credit_params +set_credit API::OpenlabProjectsController - -API::OpenlabProjectsController - -index - - -_layout + +API::OpenlabProjectsController + +index + + +_layout API::ComponentsController - -API::ComponentsController - -create -destroy -index -show -update - - -_layout -component_params -set_component + +API::ComponentsController + +create +destroy +index +show +update + + +_layout +component_params +set_component API::CustomAssetsController - -API::CustomAssetsController - -create -destroy -index -show -update - - -_layout -custom_asset_params -set_custom_asset + +API::CustomAssetsController + +create +destroy +index +show +update + + +_layout +custom_asset_params +set_custom_asset API::PricingController - -API::PricingController - -index -update - - -_layout + +API::PricingController + +index +update + + +_layout API::AbusesController - -API::AbusesController - -create -index - - -_layout -abuse_params + +API::AbusesController + +create +index + + +_layout +abuse_params API::PriceCategoriesController - -API::PriceCategoriesController - -create -destroy -index -show -update - - -_layout -price_category_params -set_price_category + +API::PriceCategoriesController + +create +destroy +index +show +update + + +_layout +price_category_params +set_price_category API::FeedsController - -API::FeedsController - -twitter_timelines - - -_layout + +API::FeedsController + +twitter_timelines + + +_layout API::MembersController @@ -395,139 +395,139 @@ API::PricesController - -API::PricesController - -compute -index -update - - -_layout -compute_price_params -coupon_params -price_params + +API::PricesController + +compute +index +update + + +_layout +compute_price_params +coupon_params +price_params API::TranslationsController - -API::TranslationsController - -set_locale -show - - -_layout + +API::TranslationsController + +set_locale +show + + +_layout API::ExportsController - -API::ExportsController - -download -status - - -_layout -set_export + +API::ExportsController + +download +status + + +_layout +set_export API::ReservationsController - -API::ReservationsController - -create -index -show -update - - -_layout -coupon_params -reservation_params -set_reservation + +API::ReservationsController + +create +index +show +update + + +_layout +coupon_params +reservation_params +set_reservation API::EventsController - -API::EventsController - -create -destroy -index -show -upcoming -update - - -_layout -event_params -set_event + +API::EventsController + +create +destroy +index +show +upcoming +update + + +_layout +event_params +set_event API::MachinesController - -API::MachinesController - -create -destroy -index -show -update - - -_layout -is_reserved -machine_params -set_machine + +API::MachinesController + +create +destroy +index +show +update + + +_layout +is_reserved +machine_params +set_machine API::EventThemesController - -API::EventThemesController - -create -destroy -index -show -update - - -_layout -event_theme_params -set_event_theme + +API::EventThemesController + +create +destroy +index +show +update + + +_layout +event_theme_params +set_event_theme API::ThemesController - -API::ThemesController - -create -destroy -index -show -update - - -_layout -set_theme -theme_params + +API::ThemesController + +create +destroy +index +show +update + + +_layout +set_theme +theme_params API::CategoriesController - -API::CategoriesController - -create -destroy -index -show -update - - -_layout -category_params -set_category + +API::CategoriesController + +create +destroy +index +show +update + + +_layout +category_params +set_category API::SubscriptionsController @@ -548,42 +548,52 @@ API::StylesheetsController - -API::StylesheetsController - -show - - -_layout + +API::StylesheetsController + +show + + +_layout API::SlotsController - -API::SlotsController - -cancel -update - - -_layout -set_slot -slot_params + +API::SlotsController + +cancel +update + + +_layout +set_slot +slot_params + + +API::VersionController + +API::VersionController + +show + + +_layout -API::AdminsController - -API::AdminsController - -create -destroy -index - - -_layout -admin_params +API::AdminsController + +API::AdminsController + +create +destroy +index + + +_layout +admin_params -API::GroupsController +API::GroupsController API::GroupsController @@ -597,7 +607,7 @@ group_params -API::AvailabilitiesController +API::AvailabilitiesController API::AvailabilitiesController @@ -624,207 +634,237 @@ verify_training_event_is_reserved -API::UsersController - -API::UsersController - -create -index - - -_layout -partner_params +API::UsersController + +API::UsersController + +create +index + + +_layout +partner_params -API::ProjectsController - -API::ProjectsController - -collaborator_valid -create -destroy -index -last_published -search -show -update - - -_layout -project_params -set_project +API::ProjectsController + +API::ProjectsController + +allowed_extensions +collaborator_valid +create +destroy +index +last_published +search +show +update + + +_layout +project_params +set_project -API::WalletController - -API::WalletController - -by_user -credit -transactions - - -_layout +API::WalletController + +API::WalletController + +by_user +credit +transactions + + +_layout -API::NotificationsController - -API::NotificationsController - -index -show -update -update_all - - -_layout -set_notification +API::NotificationsController + +API::NotificationsController + +index +show +update +update_all + + +_layout +set_notification -API::TrainingsController - -API::TrainingsController - -availabilities -create -destroy -index -show -update - - -_layout -set_training -training_params -valid_training_params +API::TrainingsController + +API::TrainingsController + +availabilities +create +destroy +index +show +update + + +_layout +set_training +training_params +valid_training_params -API::SettingsController - -API::SettingsController - -index -show -update - - -_layout -names_as_string_to_array -setting_params +API::SettingsController + +API::SettingsController + +index +show +update + + +_layout +names_as_string_to_array +setting_params -API::OpenAPIClientsController - -API::OpenAPIClientsController - -create -destroy -index -reset_token -update - - -_layout -client_params +API::OpenAPIClientsController + +API::OpenAPIClientsController + +create +destroy +index +reset_token +update + + +_layout +client_params -API::InvoicesController - -API::InvoicesController - -create -download -index -list - - -_layout -avoir_params -set_invoice +API::InvoicesController + +API::InvoicesController + +create +download +index +list + + +_layout +avoir_params +set_invoice -API::LicencesController - -API::LicencesController - -create -destroy -index -show -update - - -_layout -licence_params -set_licence +API::LicencesController + +API::LicencesController + +create +destroy +index +show +update + + +_layout +licence_params +set_licence -SocialBotController - -SocialBotController - -share - - -_layout +SocialBotController + +SocialBotController + +share + + +_layout -PasswordsController - -PasswordsController - -create - - -_layout +PasswordsController + +PasswordsController + +create + + +_layout -ApplicationController - -ApplicationController - -index - -configure_permitted_parameters -default_url_options -permission_denied -set_csrf_cookie -verified_request? - -_layout +ApplicationController + +ApplicationController + +index + +configure_permitted_parameters +default_url_options +permission_denied +set_csrf_cookie +verified_request? + +_layout -Users::OmniauthCallbacksController - -Users::OmniauthCallbacksController - -database-fablab - - -_layout -email_exists? -generate_unique_username -username_exists? +Users::OmniauthCallbacksController + +Users::OmniauthCallbacksController + +database-fablab + + +_layout +email_exists? +generate_unique_username +username_exists? -WebhooksController - -WebhooksController - -create - - -_layout +WebhooksController + +WebhooksController + +create + + +_layout + + +Rss::RssController + +Rss::RssController + + + +_layout + + +Rss::EventsController + +Rss::EventsController + +index + + +_layout + + +Rss::ProjectsController + +Rss::ProjectsController + +index + + +_layout -ConfirmationsController - -ConfirmationsController - -after_confirmation_path_for - - -_layout +ConfirmationsController + +ConfirmationsController + +after_confirmation_path_for + + +_layout diff --git a/doc/models_brief.svg b/doc/models_brief.svg index bca030210..2ed4ad308 100644 --- a/doc/models_brief.svg +++ b/doc/models_brief.svg @@ -12,8 +12,8 @@ _diagram_info Models diagram -Date: Sep 15 2016 - 17:48 -Migration version: 20160915105234 +Date: Nov 23 2016 - 10:21 +Migration version: 20160922155555 Generated by RailRoady 1.4.0 http://railroady.prestonlee.com @@ -29,9 +29,9 @@ Group->Price - - - + + + machines_prices @@ -41,9 +41,9 @@ Group->TrainingsPricing - - - + + + Plan @@ -52,9 +52,9 @@ Group->Plan - - - + + + User @@ -63,9 +63,9 @@ Group->User - - - + + + InvoiceItem @@ -74,9 +74,9 @@ InvoiceItem->InvoiceItem - - - + + + AvailabilityTag @@ -105,9 +105,9 @@ OpenAPI::Client->OpenAPI::CallsCountTracing - - - + + + OpenAPI::ParameterError @@ -131,15 +131,15 @@ Tag->AvailabilityTag - - - + + + Tag->User - - - + + + Availability @@ -148,9 +148,9 @@ Tag->Availability - - - + + + UserTag @@ -159,9 +159,9 @@ Tag->UserTag - - - + + + Event @@ -175,9 +175,9 @@ Event->PriceCategory - - - + + + EventTheme @@ -186,9 +186,9 @@ Event->EventTheme - - - + + + EventImage @@ -197,9 +197,9 @@ Event->EventImage - - - + + + Reservation @@ -208,9 +208,9 @@ Event->Reservation - - - + + + EventPriceCategory @@ -219,9 +219,9 @@ Event->EventPriceCategory - - - + + + EventFile @@ -230,9 +230,9 @@ Event->EventFile - - - + + + StatisticSubType @@ -246,9 +246,9 @@ StatisticSubType->StatisticType - - - + + + StatisticTypeSubType @@ -257,9 +257,9 @@ StatisticSubType->StatisticTypeSubType - - - + + + Project @@ -268,15 +268,15 @@ Project->ProjectImage - - - + + + Project->User - - - + + + Theme @@ -285,9 +285,9 @@ Project->Theme - - - + + + ProjectCao @@ -296,9 +296,9 @@ Project->ProjectCao - - - + + + ProjectStep @@ -307,9 +307,9 @@ Project->ProjectStep - - - + + + ProjectUser @@ -318,9 +318,9 @@ Project->ProjectUser - - - + + + Machine @@ -329,9 +329,9 @@ Project->Machine - - - + + + Component @@ -340,9 +340,9 @@ Project->Component - - - + + + CustomAsset @@ -356,9 +356,9 @@ CustomAsset->CustomAssetFile - - - + + + AgeRange @@ -367,9 +367,9 @@ AgeRange->Event - - - + + + Wallet @@ -383,9 +383,9 @@ Wallet->WalletTransaction - - - + + + Stats::Event @@ -424,9 +424,9 @@ PriceCategory->EventPriceCategory - - - + + + Invoice @@ -435,15 +435,15 @@ Invoice->InvoiceItem - - - + + + Invoice->Invoice - - - + + + avoir @@ -458,9 +458,9 @@ OfferDay->Invoice - - - + + + StatisticIndex @@ -469,15 +469,15 @@ StatisticType->StatisticIndex - - - + + + StatisticType->StatisticTypeSubType - - - + + + StatisticCustomAggregation @@ -486,9 +486,9 @@ StatisticType->StatisticCustomAggregation - - - + + + Address @@ -497,15 +497,15 @@ Plan->Price - - - + + + Plan->PlanFile - - - + + + Credit @@ -514,22 +514,22 @@ Plan->Credit - - - + + + Plan->Credit - - - + + + training_credits Plan->Credit - - - + + + machine_credits @@ -539,9 +539,9 @@ Plan->Subscription - - - + + + PlanImage @@ -550,9 +550,9 @@ Plan->PlanImage - - - + + + MachineFile @@ -566,9 +566,9 @@ Organization->Address - - - + + + StatisticGraph @@ -587,47 +587,47 @@ Licence->Project - - - + + + User->Project - - - + + + my_projects User->Wallet - - - + + + User->Invoice - - - + + + User->Credit - - - + + + User->Credit - - - + + + training_credits User->Credit - - - + + + machine_credits @@ -637,9 +637,9 @@ User->Role - - - + + + Notification @@ -648,15 +648,15 @@ User->Notification - - - + + + User->Subscription - - - + + + Training @@ -665,15 +665,15 @@ User->Training - - - + + + User->Reservation - - - + + + UsersCredit @@ -682,15 +682,15 @@ User->UsersCredit - - - + + + User->UserTag - - - + + + Export @@ -699,9 +699,9 @@ User->Export - - - + + + UserTraining @@ -710,15 +710,15 @@ User->UserTraining - - - + + + User->ProjectUser - - - + + + Profile @@ -727,9 +727,9 @@ User->Profile - - - + + + ProjectStepImage @@ -738,9 +738,9 @@ Credit->UsersCredit - - - + + + PartnerPlan @@ -749,53 +749,53 @@ PartnerPlan->Price - - - + + + PartnerPlan->PlanFile - - - + + + PartnerPlan->Credit - - - + + + PartnerPlan->Credit - - - + + + training_credits PartnerPlan->Credit - - - + + + machine_credits PartnerPlan->Role - - - + + + PartnerPlan->Subscription - - - + + + PartnerPlan->PlanImage - - - + + + OAuth2Provider @@ -804,9 +804,9 @@ OAuth2Provider->OAuth2Mapping - - - + + + AuthProvider @@ -815,9 +815,9 @@ OAuth2Provider->AuthProvider - - - + + + Asset @@ -836,33 +836,33 @@ DatabaseProvider->AuthProvider - - - + + + Availability->AvailabilityTag - - - + + + Availability->Event - - - + + + Availability->Training - - - + + + Availability->Reservation - - - + + + Slot @@ -871,9 +871,9 @@ Availability->Slot - - - + + + MachinesAvailability @@ -882,9 +882,9 @@ Availability->MachinesAvailability - - - + + + TrainingsAvailability @@ -893,93 +893,93 @@ Availability->TrainingsAvailability - - - + + + Availability->Machine - - - + + + Subscription->Invoice - - - + + + Subscription->OfferDay - - - + + + Training->TrainingImage - - - + + + Training->TrainingsPricing - - - + + + Training->Plan - - - + + + Training->Credit - - - + + + Training->Reservation - - - + + + Training->UserTraining - - - + + + Training->TrainingsAvailability - - - + + + Training->Machine - - - + + + ProjectStep->ProjectStepImage - - - + + + Reservation->Invoice - - - + + + Reservation->Slot - - - + + + Ticket @@ -988,21 +988,21 @@ Reservation->Ticket - - - + + + StatisticIndex->StatisticType - - - + + + StatisticIndex->StatisticGraph - - - + + + StatisticField @@ -1011,27 +1011,27 @@ StatisticIndex->StatisticField - - - + + + StatisticField->StatisticIndex - - - + + + WalletTransaction->Invoice - - - + + + EventPriceCategory->Ticket - - - + + + Avoir @@ -1040,15 +1040,15 @@ Avoir->InvoiceItem - - - + + + Avoir->Invoice - - - + + + avoir @@ -1068,9 +1068,9 @@ Coupon->Invoice - - - + + + Category @@ -1079,9 +1079,9 @@ Category->Event - - - + + + MachineImage @@ -1095,45 +1095,45 @@ Machine->Price - - - + + + Machine->Plan - - - + + + Machine->MachineFile - - - + + + Machine->Credit - - - + + + Machine->Reservation - - - + + + Machine->MachinesAvailability - - - + + + Machine->MachineImage - - - + + + Abuse @@ -1142,21 +1142,21 @@ Profile->UserAvatar - - - + + + Profile->Address - - - + + + Profile->Organization - - - + + + Setting diff --git a/doc/models_complete.svg b/doc/models_complete.svg index dd4b1aa9c..e686ad63d 100644 --- a/doc/models_complete.svg +++ b/doc/models_complete.svg @@ -4,29 +4,29 @@ - - + + models_diagram - + _diagram_info -Models diagram -Date: Sep 15 2016 - 17:48 -Migration version: 20160915105234 -Generated by RailRoady 1.4.0 -http://railroady.prestonlee.com +Models diagram +Date: Nov 23 2016 - 10:20 +Migration version: 20160922155555 +Generated by RailRoady 1.4.0 +http://railroady.prestonlee.com Group - -Group - -id :integer -name :character varying(255) -created_at :timestamp without time zone -updated_at :timestamp without time zone -slug :character varying(255) + +Group + +id :integer +name :character varying(255) +created_at :timestamp without time zone +updated_at :timestamp without time zone +slug :character varying(255) Price @@ -44,9 +44,9 @@ Group->Price - - - + + + machines_prices @@ -63,9 +63,9 @@ Group->TrainingsPricing - - - + + + Plan @@ -90,9 +90,9 @@ Group->Plan - - - + + + User @@ -134,9 +134,9 @@ Group->User - - - + + + InvoiceItem @@ -155,9 +155,9 @@ InvoiceItem->InvoiceItem - - - + + + AvailabilityTag @@ -172,8 +172,8 @@ OpenAPI - -OpenAPI + +OpenAPI TrainingImage @@ -190,15 +190,15 @@ OpenAPI::Client - -OpenAPI::Client - -id :integer -name :character varying -calls_count :integer -token :character varying -created_at :timestamp without time zone -updated_at :timestamp without time zone + +OpenAPI::Client + +id :integer +name :character varying +calls_count :integer +token :character varying +created_at :timestamp without time zone +updated_at :timestamp without time zone OpenAPI::CallsCountTracing @@ -214,16 +214,16 @@ OpenAPI::Client->OpenAPI::CallsCountTracing - - - + + + OpenAPI::ParameterError - -OpenAPI::ParameterError - - + +OpenAPI::ParameterError + + UserAvatar @@ -253,25 +253,25 @@ Tag - -Tag - -id :integer -name :character varying -created_at :timestamp without time zone -updated_at :timestamp without time zone + +Tag + +id :integer +name :character varying +created_at :timestamp without time zone +updated_at :timestamp without time zone Tag->AvailabilityTag - - - + + + Tag->User - - - + + + Availability @@ -289,9 +289,9 @@ Tag->Availability - - - + + + UserTag @@ -306,9 +306,9 @@ Tag->UserTag - - - + + + Event @@ -341,9 +341,9 @@ Event->PriceCategory - - - + + + EventTheme @@ -358,9 +358,9 @@ Event->EventTheme - - - + + + EventImage @@ -377,9 +377,9 @@ Event->EventImage - - - + + + Reservation @@ -398,9 +398,9 @@ Event->Reservation - - - + + + EventPriceCategory @@ -416,9 +416,9 @@ Event->EventPriceCategory - - - + + + EventFile @@ -435,20 +435,20 @@ Event->EventFile - - - + + + StatisticSubType - -StatisticSubType - -id :integer -key :character varying(255) -label :character varying(255) -created_at :timestamp without time zone -updated_at :timestamp without time zone + +StatisticSubType + +id :integer +key :character varying(255) +label :character varying(255) +created_at :timestamp without time zone +updated_at :timestamp without time zone StatisticType @@ -466,9 +466,9 @@ StatisticSubType->StatisticType - - - + + + StatisticTypeSubType @@ -483,9 +483,9 @@ StatisticSubType->StatisticTypeSubType - - - + + + Project @@ -506,15 +506,15 @@ Project->ProjectImage - - - + + + Project->User - - - + + + Theme @@ -526,9 +526,9 @@ Project->Theme - - - + + + ProjectCao @@ -545,9 +545,9 @@ Project->ProjectCao - - - + + + ProjectStep @@ -564,9 +564,9 @@ Project->ProjectStep - - - + + + ProjectUser @@ -583,9 +583,9 @@ Project->ProjectUser - - - + + + Machine @@ -602,9 +602,9 @@ Project->Machine - - - + + + Component @@ -616,19 +616,19 @@ Project->Component - - - + + + CustomAsset - -CustomAsset - -id :integer -name :character varying -created_at :timestamp without time zone -updated_at :timestamp without time zone + +CustomAsset + +id :integer +name :character varying +created_at :timestamp without time zone +updated_at :timestamp without time zone CustomAssetFile @@ -645,9 +645,9 @@ CustomAsset->CustomAssetFile - - - + + + AgeRange @@ -662,9 +662,9 @@ AgeRange->Event - - - + + + Wallet @@ -694,64 +694,64 @@ Wallet->WalletTransaction - - - + + + Stats::Event - -Stats::Event - - + +Stats::Event + + Stats::Project - -Stats::Project - - + +Stats::Project + + Stats::User - -Stats::User - - + +Stats::User + + Stats::Subscription - -Stats::Subscription - - + +Stats::Subscription + + Stats::Training - -Stats::Training - - + +Stats::Training + + Stats::Account - -Stats::Account - - + +Stats::Account + + Stats::Machine - -Stats::Machine - - + +Stats::Machine + + PriceCategory->EventPriceCategory - - - + + + Invoice @@ -779,15 +779,15 @@ Invoice->InvoiceItem - - - + + + Invoice->Invoice - - - + + + avoir @@ -817,9 +817,9 @@ OfferDay->Invoice - - - + + + StatisticIndex @@ -836,15 +836,15 @@ StatisticType->StatisticIndex - - - + + + StatisticType->StatisticTypeSubType - - - + + + StatisticCustomAggregation @@ -862,9 +862,9 @@ StatisticType->StatisticCustomAggregation - - - + + + Address @@ -885,15 +885,15 @@ Plan->Price - - - + + + Plan->PlanFile - - - + + + Credit @@ -910,22 +910,22 @@ Plan->Credit - - - + + + Plan->Credit - - - + + + training_credits Plan->Credit - - - + + + machine_credits @@ -944,9 +944,9 @@ Plan->Subscription - - - + + + PlanImage @@ -963,9 +963,9 @@ Plan->PlanImage - - - + + + MachineFile @@ -993,9 +993,9 @@ Organization->Address - - - + + + StatisticGraph @@ -1036,47 +1036,47 @@ Licence->Project - - - + + + User->Project - - - + + + my_projects User->Wallet - - - + + + User->Invoice - - - + + + User->Credit - - - + + + User->Credit - - - + + + training_credits User->Credit - - - + + + machine_credits @@ -1093,9 +1093,9 @@ User->Role - - - + + + Notification @@ -1116,15 +1116,15 @@ User->Notification - - - + + + User->Subscription - - - + + + Training @@ -1142,15 +1142,15 @@ User->Training - - - + + + User->Reservation - - - + + + UsersCredit @@ -1166,15 +1166,15 @@ User->UsersCredit - - - + + + User->UserTag - - - + + + Export @@ -1192,9 +1192,9 @@ User->Export - - - + + + UserTraining @@ -1209,15 +1209,15 @@ User->UserTraining - - - + + + User->ProjectUser - - - + + + Profile @@ -1254,9 +1254,9 @@ User->Profile - - - + + + ProjectStepImage @@ -1273,9 +1273,9 @@ Credit->UsersCredit - - - + + + PartnerPlan @@ -1300,74 +1300,75 @@ PartnerPlan->Price - - - + + + PartnerPlan->PlanFile - - - + + + PartnerPlan->Credit - - - + + + PartnerPlan->Credit - - - + + + training_credits PartnerPlan->Credit - - - + + + machine_credits PartnerPlan->Role - - - + + + PartnerPlan->Subscription - - - + + + PartnerPlan->PlanImage - - - + + + OAuth2Provider - -OAuth2Provider - -id :integer -base_url :character varying -token_endpoint :character varying -authorization_endpoint :character varying -client_id :character varying -client_secret :character varying -created_at :timestamp without time zone -updated_at :timestamp without time zone -profile_url :character varying + +OAuth2Provider + +id :integer +base_url :character varying +token_endpoint :character varying +authorization_endpoint :character varying +client_id :character varying +client_secret :character varying +created_at :timestamp without time zone +updated_at :timestamp without time zone +profile_url :character varying +logout_endpoint :character varying OAuth2Provider->OAuth2Mapping - - - + + + AuthProvider @@ -1384,66 +1385,66 @@ OAuth2Provider->AuthProvider - - - + + + Asset - -Asset - -id :integer -viewable_id :integer -viewable_type :character varying(255) -attachment :character varying(255) -type :character varying(255) -created_at :timestamp without time zone -updated_at :timestamp without time zone + +Asset + +id :integer +viewable_id :integer +viewable_type :character varying(255) +attachment :character varying(255) +type :character varying(255) +created_at :timestamp without time zone +updated_at :timestamp without time zone Project::OpenlabSync - -Project::OpenlabSync + +Project::OpenlabSync DatabaseProvider - -DatabaseProvider - -id :integer -created_at :timestamp without time zone -updated_at :timestamp without time zone + +DatabaseProvider + +id :integer +created_at :timestamp without time zone +updated_at :timestamp without time zone DatabaseProvider->AuthProvider - - - + + + Availability->AvailabilityTag - - - + + + Availability->Event - - - + + + Availability->Training - - - + + + Availability->Reservation - - - + + + Slot @@ -1464,9 +1465,9 @@ Availability->Slot - - - + + + MachinesAvailability @@ -1479,9 +1480,9 @@ Availability->MachinesAvailability - - - + + + TrainingsAvailability @@ -1496,93 +1497,93 @@ Availability->TrainingsAvailability - - - + + + Availability->Machine - - - + + + Subscription->Invoice - - - + + + Subscription->OfferDay - - - + + + Training->TrainingImage - - - + + + Training->TrainingsPricing - - - + + + Training->Plan - - - + + + Training->Credit - - - + + + Training->Reservation - - - + + + Training->UserTraining - - - + + + Training->TrainingsAvailability - - - + + + Training->Machine - - - + + + ProjectStep->ProjectStepImage - - - + + + Reservation->Invoice - - - + + + Reservation->Slot - - - + + + Ticket @@ -1598,21 +1599,21 @@ Reservation->Ticket - - - + + + StatisticIndex->StatisticType - - - + + + StatisticIndex->StatisticGraph - - - + + + StatisticField @@ -1629,27 +1630,27 @@ StatisticIndex->StatisticField - - - + + + StatisticField->StatisticIndex - - - + + + WalletTransaction->Invoice - - - + + + EventPriceCategory->Ticket - - - + + + Avoir @@ -1677,33 +1678,33 @@ Avoir->InvoiceItem - - - + + + Avoir->Invoice - - - + + + avoir NotificationType - -NotificationType - - + +NotificationType + + Stylesheet - -Stylesheet - -id :integer -contents :text -created_at :timestamp without time zone -updated_at :timestamp without time zone + +Stylesheet + +id :integer +contents :text +created_at :timestamp without time zone +updated_at :timestamp without time zone Coupon @@ -1723,9 +1724,9 @@ Coupon->Invoice - - - + + + Category @@ -1740,9 +1741,9 @@ Category->Event - - - + + + MachineImage @@ -1759,96 +1760,96 @@ Feed - -Feed - - + +Feed + + Machine->Price - - - + + + Machine->Plan - - - + + + Machine->MachineFile - - - + + + Machine->Credit - - - + + + Machine->Reservation - - - + + + Machine->MachinesAvailability - - - + + + Machine->MachineImage - - - + + + Abuse - -Abuse - -id :integer -signaled_id :integer -signaled_type :character varying -first_name :character varying -last_name :character varying -email :character varying -message :text -created_at :timestamp without time zone -updated_at :timestamp without time zone + +Abuse + +id :integer +signaled_id :integer +signaled_type :character varying +first_name :character varying +last_name :character varying +email :character varying +message :text +created_at :timestamp without time zone +updated_at :timestamp without time zone Profile->UserAvatar - - - + + + Profile->Address - - - + + + Profile->Organization - - - + + + Setting - -Setting - -id :integer -name :character varying -value :text -created_at :timestamp without time zone -updated_at :timestamp without time zone + +Setting + +id :integer +name :character varying +value :text +created_at :timestamp without time zone +updated_at :timestamp without time zone From b7737be6f31dba4bb997c8db849b710de053836d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 23 Nov 2016 11:44:48 +0100 Subject: [PATCH 063/289] fix migration rollback --- .../20160906145713_insert_custom_aggregations.rb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/db/migrate/20160906145713_insert_custom_aggregations.rb b/db/migrate/20160906145713_insert_custom_aggregations.rb index 90c95e456..1b23072c1 100644 --- a/db/migrate/20160906145713_insert_custom_aggregations.rb +++ b/db/migrate/20160906145713_insert_custom_aggregations.rb @@ -1,5 +1,5 @@ class InsertCustomAggregations < ActiveRecord::Migration - def change + def up # available reservations hours for machines machine = StatisticIndex.find_by_es_type_key('machine') machine_hours = StatisticType.find_by(key: 'hour', statistic_index_id: machine.id) @@ -26,4 +26,17 @@ class InsertCustomAggregations < ActiveRecord::Migration }) available_tickets.save! end + + def down + + machine = StatisticIndex.find_by_es_type_key('machine') + machine_hours = StatisticType.find_by(key: 'hour', statistic_index_id: machine.id) + + StatisticCustomAggregation.where(field: 'available_hours', statistic_type_id: machine_hours.id).first.destroy! + + training = StatisticIndex.find_by_es_type_key('training') + training_bookings = StatisticType.find_by(key: 'booking', statistic_index_id: training.id) + + StatisticCustomAggregation.where(field: 'available_tickets', statistic_type_id: training_bookings.id).first.destroy! + end end From ad2911529c9cb4bec2901f442d360c0a16dd04d4 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 23 Nov 2016 12:43:42 +0100 Subject: [PATCH 064/289] db model, api and interface for cash coupons --- .../controllers/admin/coupons.coffee | 16 ++++++--- .../controllers/admin/pricing.coffee.erb | 7 ++-- .../templates/admin/coupons/_form.html.erb | 34 +++++++++++++++++-- .../templates/admin/pricing/coupons.html.erb | 7 ++-- app/controllers/api/coupons_controller.rb | 2 +- app/models/coupon.rb | 11 ++++-- app/validators/coupon_discount_validator.rb | 15 ++++++++ app/views/api/coupons/_coupon.json.jbuilder | 2 +- app/workers/stripe_worker.rb | 2 ++ config/locales/app.admin.en.yml | 2 +- config/locales/app.admin.fr.yml | 2 +- config/locales/app.shared.en.yml | 4 +++ config/locales/app.shared.fr.yml | 4 +++ ...0161123104604_add_amount_off_to_coupons.rb | 5 +++ db/schema.rb | 4 ++- 15 files changed, 100 insertions(+), 17 deletions(-) create mode 100644 app/validators/coupon_discount_validator.rb create mode 100644 db/migrate/20161123104604_add_amount_off_to_coupons.rb diff --git a/app/assets/javascripts/controllers/admin/coupons.coffee b/app/assets/javascripts/controllers/admin/coupons.coffee index eef8f658c..32a49bef3 100644 --- a/app/assets/javascripts/controllers/admin/coupons.coffee +++ b/app/assets/javascripts/controllers/admin/coupons.coffee @@ -8,12 +8,17 @@ userValidities = ['once', 'forever'] ## # Controller used in the coupon creation page ## -Application.Controllers.controller "NewCouponController", ["$scope", "$state",'Coupon', 'growl', '_t' -, ($scope, $state, Coupon, growl, _t) -> +Application.Controllers.controller "NewCouponController", ["$scope", "$state", '$locale', 'Coupon', 'growl', '_t' +, ($scope, $state, $locale, Coupon, growl, _t) -> ## Values for the coupon currently created $scope.coupon = active: true + type: 'percent_off' + + + ## currency symbol for the current locale (cf. angular-i18n) + $scope.currencySymbol = $locale.NUMBER_FORMATS.CURRENCY_SYM; ## Options for the validity per user $scope.validities = userValidities @@ -57,8 +62,8 @@ Application.Controllers.controller "NewCouponController", ["$scope", "$state",'C ## # Controller used in the coupon edition page ## -Application.Controllers.controller "EditCouponController", ["$scope", "$state", 'Coupon', 'couponPromise', '_t' -, ($scope, $state, Coupon, couponPromise, _t) -> +Application.Controllers.controller "EditCouponController", ["$scope", "$state", '$locale', 'Coupon', 'couponPromise', '_t' +, ($scope, $state, $locale, Coupon, couponPromise, _t) -> ### PUBLIC SCOPE ### @@ -72,6 +77,9 @@ Application.Controllers.controller "EditCouponController", ["$scope", "$state", ## Options for the validity per user $scope.validities = userValidities + ## currency symbol for the current locale (cf. angular-i18n) + $scope.currencySymbol = $locale.NUMBER_FORMATS.CURRENCY_SYM; + ## Default parameters for AngularUI-Bootstrap datepicker (used for coupon validity limit selection) $scope.datePicker = format: Fablab.uibDateFormat diff --git a/app/assets/javascripts/controllers/admin/pricing.coffee.erb b/app/assets/javascripts/controllers/admin/pricing.coffee.erb index 4d69bfae7..54bcaeb0f 100644 --- a/app/assets/javascripts/controllers/admin/pricing.coffee.erb +++ b/app/assets/javascripts/controllers/admin/pricing.coffee.erb @@ -3,8 +3,8 @@ ## # Controller used in the prices edition page ## -Application.Controllers.controller "EditPricingController", ["$scope", "$state", '$uibModal', 'TrainingsPricing', '$filter', 'Credit', 'Pricing', 'Plan', 'Coupon', 'plans', 'groups', 'growl', 'machinesPricesPromise', 'Price', 'dialogs', 'trainingsPricingsPromise', 'trainingsPromise', 'machineCreditsPromise', 'machinesPromise', 'trainingCreditsPromise', 'couponsPromise', '_t' -, ($scope, $state, $uibModal, TrainingsPricing, $filter, Credit, Pricing, Plan, Coupon, plans, groups, growl, machinesPricesPromise, Price, dialogs, trainingsPricingsPromise, trainingsPromise, machineCreditsPromise, machinesPromise, trainingCreditsPromise, couponsPromise, _t) -> +Application.Controllers.controller "EditPricingController", ["$scope", "$state", '$uibModal', '$locale', '$filter', 'TrainingsPricing', 'Credit', 'Pricing', 'Plan', 'Coupon', 'plans', 'groups', 'growl', 'machinesPricesPromise', 'Price', 'dialogs', 'trainingsPricingsPromise', 'trainingsPromise', 'machineCreditsPromise', 'machinesPromise', 'trainingCreditsPromise', 'couponsPromise', '_t' +, ($scope, $state, $uibModal, $locale, $filter, TrainingsPricing, Credit, Pricing, Plan, Coupon, plans, groups, growl, machinesPricesPromise, Price, dialogs, trainingsPricingsPromise, trainingsPromise, machineCreditsPromise, machinesPromise, trainingCreditsPromise, couponsPromise, _t) -> ### PUBLIC SCOPE ### ## List of machines prices (not considering any plan) @@ -44,6 +44,9 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", $scope.status = isopen: false + ## currency symbol for the current locale (cf. angular-i18n) + $scope.currencySymbol = $locale.NUMBER_FORMATS.CURRENCY_SYM; + $scope.findTrainingsPricing = (trainingsPricings, trainingId, groupId)-> diff --git a/app/assets/templates/admin/coupons/_form.html.erb b/app/assets/templates/admin/coupons/_form.html.erb index 81274bcc2..4cc92c9f6 100644 --- a/app/assets/templates/admin/coupons/_form.html.erb +++ b/app/assets/templates/admin/coupons/_form.html.erb @@ -21,7 +21,20 @@ {{ 'code_must_be_composed_of_capital_letters_digits_and_or_dashes' }}
-
+
+ + +
+ +
+ ng-required="coupon.type == 'percent_off'"/>
{{ 'percent_off_is_required' }} {{ 'percentage_must_be_between_0_and_100' }}
+ +
+ +
+ {{currencySymbol}} + +
+ {{ 'percent_off_is_required' }} + {{ 'percentage_must_be_between_0_and_100' }} +
+
+ + {{msg.message}}
diff --git a/app/controllers/api/prices_controller.rb b/app/controllers/api/prices_controller.rb index 2c9dacd10..19acd769e 100644 --- a/app/controllers/api/prices_controller.rb +++ b/app/controllers/api/prices_controller.rb @@ -41,7 +41,7 @@ class API::PricesController < API::ApiController _user = User.find(_price_params[:user_id]) # reservable if _price_params[:reservable_id].nil? - @amount = {elements: nil, total: 0} + @amount = {elements: nil, total: 0, before_coupon: 0} else _reservable = _price_params[:reservable_type].constantize.find(_price_params[:reservable_id]) @amount = Price.compute(current_user.is_admin?, _user, _reservable, _price_params[:slots_attributes], _price_params[:plan_id], _price_params[:nb_reserve_places], _price_params[:tickets_attributes], coupon_params[:coupon_code]) From 3fad06c886c9f4b8587337adbad4096a0b75d115 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 30 Nov 2016 17:28:51 +0100 Subject: [PATCH 123/289] Version 2.4.6 --- .fabmanager-version | 2 +- CHANGELOG.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.fabmanager-version b/.fabmanager-version index 26f8b8bcd..62e64205b 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.5 \ No newline at end of file +2.4.6 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index d256af89b..ed68f9cc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog Fab Manager +## v2.4.6 2016 Novembre 30 + +- Change display of message about coupon application status +- Fix a bug: compute price API return error 500 if reservable_id is not provided + ## v2.4.5 2016 November 29 - Ability to create coupons with cash amounts (previously only percentages were allowed) From bb4c3bdd3546ceadc29fe38bb33b11491aab9a4f Mon Sep 17 00:00:00 2001 From: cyril Date: Wed, 30 Nov 2016 21:48:46 +0100 Subject: [PATCH 124/289] update docker Readme --- docker/README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docker/README.md b/docker/README.md index ad53b0587..a5921c83a 100644 --- a/docker/README.md +++ b/docker/README.md @@ -124,8 +124,8 @@ Requires=docker.service [Service] Type=oneshot -ExecStart=/usr/bin/docker run --rm --name letsencrypt -v "/home/core/fabmanager/log:/var/log/letsencrypt" -v "/home/core/fabmanager/letsencrypt/etc:/etc/letsencrypt" -v "/home/core/fabmanager/letsencrypt/config:/letsencrypt-config" quay.io/letsencrypt/letsencrypt:latest -c "/letsencrypt-config/webroot.ini" certonly -ExecStartPost=-/usr/bin/docker restart fabmanager +ExecStart=/usr/bin/docker run --rm --name letsencrypt -v "/apps/recreanglais/log:/var/log/letsencrypt" -v "/apps/recreanglais/letsencrypt/etc:/etc/letsencrypt" -v "/apps/recreanglais/letsencrypt/config:/letsencrypt-config" quay.io/letsencrypt/letsencrypt:latest -c "/letsencrypt-config/webroot.ini" certonly +ExecStartPost=-/usr/bin/docker restart fabmanager_nginx_1 ``` Create file (with sudo) /etc/systemd/system/letsencrypt.timer with @@ -138,6 +138,9 @@ Requires=docker.service OnCalendar=*-*-1 06:00:00 Persistent=true Unit=letsencrypt.service + +[Install] +WantedBy=timers.target ``` Then deploy your app and read the "Generate SSL certificate by Letsencrypt" section to complete the installation of the letsencrypt certificate. @@ -277,7 +280,9 @@ Remove your app and Run your app to apply changes Finally, if everything is ok, start letsencrypt timer to update the certificate every 1st of the month : ```bash +sudo systemctl enable letsencrypt.timer sudo systemctl start letsencrypt.timer +(check) sudo systemctl list-timers ``` From 5067ecd3ac85efb40ea48890a63c57e5a7da5bc5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2016 11:36:35 +0100 Subject: [PATCH 125/289] prevent elasticsearch from logging during tests (clearer output) --- config/initializers/elasticsearch.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/initializers/elasticsearch.rb b/config/initializers/elasticsearch.rb index 5f8f7d446..1e6b9966e 100644 --- a/config/initializers/elasticsearch.rb +++ b/config/initializers/elasticsearch.rb @@ -1,3 +1,8 @@ -client = Elasticsearch::Client.new host: "http://#{Rails.application.secrets.elaticsearch_host}:9200", log: true +if Rails.env.test? + client = Elasticsearch::Client.new host: "http://#{Rails.application.secrets.elaticsearch_host}:9200", log: false +else + client = Elasticsearch::Client.new host: "http://#{Rails.application.secrets.elaticsearch_host}:9200", log: true +end + Elasticsearch::Model.client = client Elasticsearch::Persistence.client = client From cf1c8685464ea8c8c56c5cb82733be592bbf46c6 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2016 11:37:09 +0100 Subject: [PATCH 126/289] test suite is now testing pdf files content --- Gemfile | 1 + Gemfile.lock | 13 ++++++++++++- test/test_helper.rb | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b0250b9a7..f0f5a271f 100644 --- a/Gemfile +++ b/Gemfile @@ -62,6 +62,7 @@ group :test do gem 'webmock' gem 'vcr' gem 'byebug' + gem 'pdf-reader' end group :production do diff --git a/Gemfile.lock b/Gemfile.lock index 6e602afad..694325a16 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GEM remote: https://rubygems.org/ specs: + Ascii85 (1.0.2) aasm (4.1.0) actionmailer (4.2.5) actionpack (= 4.2.5) @@ -41,6 +42,7 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.3.8) + afm (0.2.2) ansi (1.5.0) api-pagination (4.3.0) apipie-rails (0.3.6) @@ -177,6 +179,7 @@ GEM has_secure_token (1.0.0) activerecord (>= 3.0) hashdiff (0.3.0) + hashery (2.1.2) hashie (3.4.2) highline (1.7.1) hike (1.2.3) @@ -265,6 +268,12 @@ GEM httparty (~> 0.13) orm_adapter (0.5.0) pdf-core (0.5.1) + pdf-reader (1.4.0) + Ascii85 (~> 1.0.0) + afm (~> 0.2.1) + hashery (~> 2.0) + ruby-rc4 + ttfunk pg (0.18.1) pkg-config (1.1.7) prawn (2.0.1) @@ -335,6 +344,7 @@ GEM netrc (~> 0.7) rolify (4.0.0) ruby-progressbar (1.7.5) + ruby-rc4 (0.1.5) rubyzip (1.1.7) rufus-scheduler (3.0.9) tzinfo @@ -488,6 +498,7 @@ DEPENDENCIES omniauth omniauth-oauth2 openlab_ruby + pdf-reader pg prawn prawn-table @@ -522,4 +533,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.12.5 + 1.13.1 diff --git a/test/test_helper.rb b/test/test_helper.rb index 792006eac..484055c31 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -68,6 +68,31 @@ class ActiveSupport::TestCase assert File.exist?(invoice.file), 'Invoice PDF was not generated' + # now we check the file content + reader = PDF::Reader.new(invoice.file) + assert_equal 1, reader.page_count # single page invoice + + ht_amount = invoice.total + page = reader.pages.first + lines = page.text.scan(/^.+/) + lines.each do |line| + # check that the numbers printed into the PDF file match the total stored in DB + if line.include? I18n.t('invoices.total_amount') + assert_equal invoice.total / 100.0, parse_amount_from_invoice_line(line), 'Invoice total rendered in the PDF file does not match' + end + + # check that the VAT was correctly applied if it was configured + if line.include? I18n.t('invoices.including_total_excluding_taxes') + ht_amount = parse_amount_from_invoice_line(line) + end + end + + if Setting.find_by(name: 'invoice_VAT-active').value == 'true' + vat_rate = Setting.find_by({name: 'invoice_VAT-rate'}).value.to_f + assert_equal (invoice.total / (vat_rate / 100 + 1)), ht_amount, 'Total excluding taxes rendered in the PDF file is not computed correct' + else + assert_equal invoice.total, ht_amount, 'VAT information was rendered in the PDF file despite that VAT was disabled' + end File.delete(invoice.file) end @@ -89,6 +114,15 @@ class ActiveSupport::TestCase skip('Unable to test export which is not of the category "statistics"') end end + + private + + # Parse a line of text read from a PDF file and return the price included inside + # Line of text should be of form 'Label $10.00' + # @returns {float} + def parse_amount_from_invoice_line line + line[line.rindex(' ')+1..-1].tr(I18n.t('number.currency.format.unit'), '').to_f + end end class ActionDispatch::IntegrationTest From 33566b551db886ec545b280d909151697e4224a2 Mon Sep 17 00:00:00 2001 From: cyril Date: Thu, 1 Dec 2016 12:01:44 +0100 Subject: [PATCH 127/289] update docker doc --- docker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/README.md b/docker/README.md index a5921c83a..1d1855bd3 100644 --- a/docker/README.md +++ b/docker/README.md @@ -124,7 +124,7 @@ Requires=docker.service [Service] Type=oneshot -ExecStart=/usr/bin/docker run --rm --name letsencrypt -v "/apps/recreanglais/log:/var/log/letsencrypt" -v "/apps/recreanglais/letsencrypt/etc:/etc/letsencrypt" -v "/apps/recreanglais/letsencrypt/config:/letsencrypt-config" quay.io/letsencrypt/letsencrypt:latest -c "/letsencrypt-config/webroot.ini" certonly +ExecStart=/usr/bin/docker run --rm --name letsencrypt -v "/home/core/fabmanager/log:/var/log/letsencrypt" -v "/home/core/fabmanager/letsencrypt/etc:/etc/letsencrypt" -v "/home/core/fabmanager/letsencrypt/config:/letsencrypt-config" quay.io/letsencrypt/letsencrypt:latest -c "/letsencrypt-config/webroot.ini" certonly ExecStartPost=-/usr/bin/docker restart fabmanager_nginx_1 ``` From 2a92b06ef6db6ce56e51f92e14a12a254abefc5b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2016 12:12:44 +0100 Subject: [PATCH 128/289] test invoice with VAT --- test/integration/events/as_user_test.rb | 11 ++++++++++- test/test_helper.rb | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/test/integration/events/as_user_test.rb b/test/integration/events/as_user_test.rb index 8b32e4fca..cf1239cba 100644 --- a/test/integration/events/as_user_test.rb +++ b/test/integration/events/as_user_test.rb @@ -1,7 +1,7 @@ module Events class AsUserTest < ActionDispatch::IntegrationTest - test 'reserve event with many prices and payment means' do + test 'reserve event with many prices and payment means and VAT' do vlonchamp = User.find_by(username: 'vlonchamp') login_as(vlonchamp, scope: :user) @@ -15,6 +15,15 @@ module Events users_credit_count = UsersCredit.count wallet_transactions_count = WalletTransaction.count + # Enable the VAT at 19.6% + vat_active = Setting.find_by(name: 'invoice_VAT-active') + vat_active.value = 'true' + vat_active.save! + + vat_rate = Setting.find_by(name: 'invoice_VAT-rate') + vat_rate.value = '19.6' + vat_rate.save! + # Reserve the 'radio' event VCR.use_cassette('reserve_event_with_many_prices_and_payment_means') do post reservations_path, { diff --git a/test/test_helper.rb b/test/test_helper.rb index 484055c31..2c15f2b0f 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -89,7 +89,9 @@ class ActiveSupport::TestCase if Setting.find_by(name: 'invoice_VAT-active').value == 'true' vat_rate = Setting.find_by({name: 'invoice_VAT-rate'}).value.to_f - assert_equal (invoice.total / (vat_rate / 100 + 1)), ht_amount, 'Total excluding taxes rendered in the PDF file is not computed correct' + computed_ht = sprintf('%.2f', (invoice.total / (vat_rate / 100 + 1)) / 100.0).to_f + + assert_equal computed_ht, ht_amount, 'Total excluding taxes rendered in the PDF file is not computed correctly' else assert_equal invoice.total, ht_amount, 'VAT information was rendered in the PDF file despite that VAT was disabled' end From a738cfa650c96c5bb064e648a29a20c7a17c6e60 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2016 12:22:01 +0100 Subject: [PATCH 129/289] do not versionate coverall config --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ee0e0fc32..14be73a99 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,8 @@ .vagrant .docker +# Do not versionate coveralls token +.coveralls.yml # Plugins are versioned is their own repository /plugins/* From 4c68f815e7c5b4690d9e40b3e4b81d8b03718803 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2016 13:08:41 +0100 Subject: [PATCH 130/289] added coveralls --- .gitignore | 2 ++ Gemfile | 2 ++ Gemfile.lock | 16 ++++++++++++++++ test/test_helper.rb | 3 +++ 4 files changed, 23 insertions(+) diff --git a/.gitignore b/.gitignore index 14be73a99..9a35a3571 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp +/coverage /public/uploads /public/assets @@ -38,6 +39,7 @@ .vagrant .docker + # Do not versionate coveralls token .coveralls.yml diff --git a/Gemfile b/Gemfile index f0f5a271f..a2394f4fc 100644 --- a/Gemfile +++ b/Gemfile @@ -52,6 +52,8 @@ group :development do gem 'capistrano-maintenance', '0.0.5', require: false gem 'active_record_query_trace' + + gem 'coveralls', require: false end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 694325a16..0eab18efc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -120,6 +120,12 @@ GEM sass-rails (<= 5.0.1) sprockets (< 2.13) connection_pool (2.2.0) + coveralls (0.8.16) + json (>= 1.8, < 3) + simplecov (~> 0.12.0) + term-ansicolor (~> 1.3.0) + thor (~> 0.19.1) + tins (>= 1.6.0, < 2) crack (0.4.3) safe_yaml (~> 1.0.0) database_cleaner (1.4.1) @@ -135,6 +141,7 @@ GEM warden (~> 1.2.3) devise-async (0.9.0) devise (~> 3.2) + docile (1.1.5) domain_name (0.5.25) unf (>= 0.0.5, < 1.0.0) elasticsearch (1.0.12) @@ -375,6 +382,11 @@ GEM sidekiq (>= 2.17.3) tilt (< 2.0.0) simple_oauth (0.3.1) + simplecov (0.12.0) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) sinatra (1.4.6) rack (~> 1.4) rack-protection (~> 1.4) @@ -392,6 +404,8 @@ GEM stripe (1.30.2) json (~> 1.8.1) rest-client (~> 1.4) + term-ansicolor (1.3.2) + tins (~> 1.0) test_after_commit (1.0.0) activerecord (>= 3.2) therubyracer (0.12.0) @@ -402,6 +416,7 @@ GEM tilt (1.4.1) timers (4.0.1) hitimes + tins (1.13.0) ttfunk (1.4.0) twitter (5.14.0) addressable (~> 2.3) @@ -472,6 +487,7 @@ DEPENDENCIES chroma coffee-rails (~> 4.1.0) compass-rails (= 2.0.4) + coveralls database_cleaner devise devise-async diff --git a/test/test_helper.rb b/test/test_helper.rb index 2c15f2b0f..4b7c20e5e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,6 @@ +require 'coveralls' +Coveralls.wear!('rails') + ENV['RAILS_ENV'] ||= 'test' require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' From db8cf69771061776f7bb0d916342be7d6d14fe2d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 8 Dec 2016 12:09:04 +0100 Subject: [PATCH 131/289] [bug #55] unable to run rake db:migrate on first install --- ...160906145713_insert_custom_aggregations.rb | 42 ------------------- db/seeds.rb | 26 ++++++++++++ 2 files changed, 26 insertions(+), 42 deletions(-) delete mode 100644 db/migrate/20160906145713_insert_custom_aggregations.rb diff --git a/db/migrate/20160906145713_insert_custom_aggregations.rb b/db/migrate/20160906145713_insert_custom_aggregations.rb deleted file mode 100644 index 2e28fd5f1..000000000 --- a/db/migrate/20160906145713_insert_custom_aggregations.rb +++ /dev/null @@ -1,42 +0,0 @@ -class InsertCustomAggregations < ActiveRecord::Migration - def up - # available reservations hours for machines - machine = StatisticIndex.find_by(es_type_key: 'machine') - machine_hours = StatisticType.find_by(key: 'hour', statistic_index_id: machine.id) - - available_hours = StatisticCustomAggregation.new({ - statistic_type_id: machine_hours.id, - es_index: 'fablab', - es_type: 'availabilities', - field: 'available_hours', - query: '{"size":0, "aggregations":{"%{aggs_name}":{"sum":{"field":"hours_duration"}}}, "query":{"bool":{"must":[{"range":{"start_at":{"gte":"%{start_date}", "lte":"%{end_date}"}}}, {"match":{"available_type":"machines"}}]}}}' - }) - available_hours.save! - - # available training tickets - training = StatisticIndex.find_by(es_type_key: 'training') - training_bookings = StatisticType.find_by(key: 'booking', statistic_index_id: training.id) - - available_tickets = StatisticCustomAggregation.new({ - statistic_type_id: training_bookings.id, - es_index: 'fablab', - es_type: 'availabilities', - field: 'available_tickets', - query: '{"size":0, "aggregations":{"%{aggs_name}":{"sum":{"field":"nb_total_places"}}}, "query":{"bool":{"must":[{"range":{"start_at":{"gte":"%{start_date}", "lte":"%{end_date}"}}}, {"match":{"available_type":"training"}}]}}}' - }) - available_tickets.save! - end - - def down - - machine = StatisticIndex.find_by(es_type_key: 'machine') - machine_hours = StatisticType.find_by(key: 'hour', statistic_index_id: machine.id) - - StatisticCustomAggregation.where(field: 'available_hours', statistic_type_id: machine_hours.id).first.destroy! - - training = StatisticIndex.find_by(es_type_key: 'training') - training_bookings = StatisticType.find_by(key: 'booking', statistic_index_id: training.id) - - StatisticCustomAggregation.where(field: 'available_tickets', statistic_type_id: training_bookings.id).first.destroy! - end -end diff --git a/db/seeds.rb b/db/seeds.rb index 33ee91648..c10636074 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -396,4 +396,30 @@ unless Setting.find_by(name: 'reminder_delay').try(:value) setting = Setting.find_or_initialize_by(name: 'reminder_delay') setting.value = '24' setting.save +end + +if StatisticCustomAggregation.count == 0 + # available reservations hours for machines + machine_hours = StatisticType.find_by(key: 'hour', statistic_index_id: 2) + + available_hours = StatisticCustomAggregation.new({ + statistic_type_id: machine_hours.id, + es_index: 'fablab', + es_type: 'availabilities', + field: 'available_hours', + query: '{"size":0, "aggregations":{"%{aggs_name}":{"sum":{"field":"hours_duration"}}}, "query":{"bool":{"must":[{"range":{"start_at":{"gte":"%{start_date}", "lte":"%{end_date}"}}}, {"match":{"available_type":"machines"}}]}}}' + }) + available_hours.save! + + # available training tickets + training_bookings = StatisticType.find_by(key: 'booking', statistic_index_id: 3) + + available_tickets = StatisticCustomAggregation.new({ + statistic_type_id: training_bookings.id, + es_index: 'fablab', + es_type: 'availabilities', + field: 'available_tickets', + query: '{"size":0, "aggregations":{"%{aggs_name}":{"sum":{"field":"nb_total_places"}}}, "query":{"bool":{"must":[{"range":{"start_at":{"gte":"%{start_date}", "lte":"%{end_date}"}}}, {"match":{"available_type":"training"}}]}}}' + }) + available_tickets.save! end \ No newline at end of file From c2f638934eb7610a3db091227c127090da07487c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 12 Dec 2016 11:18:24 +0100 Subject: [PATCH 132/289] added info notice about operation's time of admin delete --- app/assets/javascripts/controllers/admin/members.coffee.erb | 6 +++--- app/assets/templates/shared/confirm_modal.html.erb | 2 +- config/locales/app.admin.en.yml | 1 + config/locales/app.admin.fr.yml | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/members.coffee.erb b/app/assets/javascripts/controllers/admin/members.coffee.erb index 9c37206d8..55d79c0ec 100644 --- a/app/assets/javascripts/controllers/admin/members.coffee.erb +++ b/app/assets/javascripts/controllers/admin/members.coffee.erb @@ -105,8 +105,8 @@ class MembersController ## # Controller used in the members/groups management page ## -Application.Controllers.controller "AdminMembersController", ["$scope", 'membersPromise', 'adminsPromise', 'growl', 'Admin', 'dialogs', '_t', 'Member', 'Export' -, ($scope, membersPromise, adminsPromise, growl, Admin, dialogs, _t, Member, Export) -> +Application.Controllers.controller "AdminMembersController", ["$scope","$sce", 'membersPromise', 'adminsPromise', 'growl', 'Admin', 'dialogs', '_t', 'Member', 'Export' +, ($scope, $sce, membersPromise, adminsPromise, growl, Admin, dialogs, _t, Member, Export) -> @@ -177,7 +177,7 @@ Application.Controllers.controller "AdminMembersController", ["$scope", 'members resolve: object: -> title: _t('confirmation_required') - msg: _t('do_you_really_want_to_delete_this_administrator_this_cannot_be_undone') + msg: $sce.trustAsHtml(_t('do_you_really_want_to_delete_this_administrator_this_cannot_be_undone') + '

' +_t('this_may_take_a_while_please_wait')) , -> # cancel confirmed Admin.delete id: admin.id, -> admins.splice(findAdminIdxById(admins, admin.id), 1) diff --git a/app/assets/templates/shared/confirm_modal.html.erb b/app/assets/templates/shared/confirm_modal.html.erb index 250bb78c1..b32db0943 100644 --- a/app/assets/templates/shared/confirm_modal.html.erb +++ b/app/assets/templates/shared/confirm_modal.html.erb @@ -3,7 +3,7 @@

{{object.title}}

-

{{object.msg}}

+

diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index bb0d52ad7..53237b8c3 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -336,6 +336,7 @@ en: groups: "Groups" authentication: "Authentication" do_you_really_want_to_delete_this_administrator_this_cannot_be_undone: "Do you really want to delete this administrator? This cannot be undone." + this_may_take_a_while_please_wait: "Warning: this may take a while, please be patient." administrator_successfully_deleted: "Administrator successfully deleted." unable_to_delete_the_administrator: "Unable to delete the administrator." add_a_group: "Add a group" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 510652ebc..8926a4cb7 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -336,6 +336,7 @@ fr: groups: "Groupes" authentication: "Authentification" do_you_really_want_to_delete_this_administrator_this_cannot_be_undone: "Êtes-vous sûr de vouloir supprimer cet administrateur ? Cette opération est irréversible." + this_may_take_a_while_please_wait: "Attention : ceci peut prendre un certain temps, merci de patienter." administrator_successfully_deleted: "L'administrateur a bien été supprimé." unable_to_delete_the_administrator: "L'administrateur n'a pas pu être supprimé." add_a_group: "Ajouter un groupe" From ed2d3b4ff017b0af579ca3bca0d75310b7430dc9 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 12 Dec 2016 11:22:37 +0100 Subject: [PATCH 133/289] updated changelog & version --- .fabmanager-version | 2 +- CHANGELOG.md | 31 ++++++++++++++++++------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.fabmanager-version b/.fabmanager-version index 62e64205b..9c9c84e9e 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.6 \ No newline at end of file +2.4.7-dev \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ed68f9cc0..814cf6e68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,14 @@ # Changelog Fab Manager +## next release +- Improved automated testing +- Added an information notice about the processing time of deleting an administrator +- Fix a bug: unable to run rake db:migrate on first install + ## v2.4.6 2016 Novembre 30 - Change display of message about coupon application status -- Fix a bug: compute price API return error 500 if reservable_id is not provided +- Fix a bug: compute price API return error 500 if reservable_id is not provided ## v2.4.5 2016 November 29 @@ -25,8 +30,8 @@ ## v2.4.3 2016 November 21 - Export user's invoicing status in members' excel export -- Fix a bug: Next events descriptions, shown on the home page, display raw html -- Fix a bug: number of reserved seats for an event is always of 1 in the excel export of reservations +- Fix a bug: Next events descriptions, shown on the home page, display raw html +- Fix a bug: number of reserved seats for an event is always of 1 in the excel export of reservations - Fix a bug: conflict between similar translations around "reservations" - Fix a bug: later occurrences of recurrent events does not have the initially configured theme and age range - Fix a bug: some graphs do not display: events, users, trainings and machine hours @@ -44,18 +49,18 @@ ## v2.4.1 2016 October 11 -- Fix a bug: unable to share a project/event without image on social networks +- Fix a bug: unable to share a project/event without image on social networks - Fix a bug: after creating an element in the admin calendar, browsing through the calendar and coming back cause the element to appear duplicated - Fix a bug: after deleting an element in the admin calendar, the confirmation message is wrong and an error is logged in the console - Fix a bug: erroneous syntax in docker env example file ## v2.4.0 2016 October 4 - + - RSS feeds to follow new projects and events published - Use slugs in projects URL opened from notifications - Ask for confirmation on machine deletion from the public view - Ability to delete a training from the public view for an admin -- Project images will show in full-size on a click +- Project images will show in full-size on a click - Add a checkbox "I accept to receive informations from the FabLab" on Sign-up dialog and user's profile - Share project with Facebook/Twitter - Display fab-manager's version in "Powered by" label, when logged as admin @@ -70,14 +75,14 @@ - Trainings are associated with a picture and an HTML textual description - Public gallery of trainings with ability to view details or to book a training on its own calendar - Ability to switch back to all trainings booking view -- Rename "Courses and Workshops" to "Events" +- Rename "Courses and Workshops" to "Events" - Admin: Events can be associated with a theme and an age range - Admin: Event categories, themes and age ranges can be customized - Filter events by category, theme and age range in public view - Ability to customise price's categories for the events - Events can be associated with many custom price's categories, instead of only one "reduced price" - Statistics views can trigger and display custom aggregations from ElasticSearch -- Machine hours/Trainings statistics: display number of tickets/hours available for booking +- Machine hours/Trainings statistics: display number of tickets/hours available for booking - Statistics will include informations abouts events category, theme and age range - Ability to export the current statistics table to an Excel file - Ability to export every statistics on a given dates range to an Excel file @@ -93,16 +98,16 @@ - More file types allowed as project CAD attachements - Project CAD attachements are now checked by MIME type in addition of extension check - Project CAD attachement allowed are now configured in environment variables -- Project CAD attachement extensions allowed are shown next to input field +- Project CAD attachement extensions allowed are shown next to input field - Display strategy's name in SSO providers list - SSO: documentation improved with an usage example - SSO: mapped fields display their data type. Integers, booleans and dates allow some transformations. - Fix a bug: project drafts are shown on public profiles - Fix a bug: event category disappear when editing the event -- Fix a bug: machine name is not shown in plan edition +- Fix a bug: machine name is not shown in plan edition - Fix a bug: machine slots with tags are not displayed correctly on reservation calendar - Fix a bug: avatar, address and organization details mapping from SSO were broken -- Fix a bug: in SSO configuration some valid endpoints were recognized as erroneous +- Fix a bug: in SSO configuration some valid endpoints were recognized as erroneous - Fix a bug: clicking on the text in stripe's payment modal, does not validate the checkbox - Fix a bug: move event reservation is not limited by admin settings (prior-delay & disable) - Fix a bug: UI issues on small devices (dashboard + admin views) @@ -134,7 +139,7 @@ - [TODO DEPLOY] `bundle install` and `rake db:migrate` ## v2.2.2 2016 June 23 -- Fix some bugs: users with uncompleted account (sso imported) won't appear in statistics, in listings and in searches. Moreover, they won't block statistics generation +- Fix some bugs: users with uncompleted account (sso imported) won't appear in statistics, in listings and in searches. Moreover, they won't block statistics generation - Fix a bug: unable to display next results in statistics tables - Admin: Category is mandatory when creating an event @@ -150,7 +155,7 @@ - User public profile: UI re-design with possible admin's customization - Admin: Invoices list and users list are now loaded per 10 items to improve pages load time - Admin: select member (eg. to buy a subscription for a member) is now loading the user's list dynamically when you type -- Project collaborators selection is now using a list dynamically loaded as you type +- Project collaborators selection is now using a list dynamically loaded as you type - Admin: select a training before monitoring its reservations -> improves page load time - API: GET /api/trainings do not load nor send the associated availabilities until they are requested - List of members is now loaded 10 members by 10, to improve page load time From b44089a33d82ae236fe6cd6174683485ba3db776 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 12 Dec 2016 14:20:26 +0100 Subject: [PATCH 134/289] interface & api to build avoir for a wallet credit --- .../controllers/admin/members.coffee.erb | 31 ++++++++- .../templates/wallet/credit_modal.html.erb | 65 ++++++++++++++++--- app/controllers/api/invoices_controller.rb | 2 +- app/controllers/api/wallet_controller.rb | 13 +++- app/services/wallet_service.rb | 19 +++++- config/locales/app.shared.en.yml | 5 ++ config/locales/app.shared.fr.yml | 5 ++ 7 files changed, 126 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/members.coffee.erb b/app/assets/javascripts/controllers/admin/members.coffee.erb index 55d79c0ec..14b2c42a9 100644 --- a/app/assets/javascripts/controllers/admin/members.coffee.erb +++ b/app/assets/javascripts/controllers/admin/members.coffee.erb @@ -423,11 +423,40 @@ Application.Controllers.controller "EditMemberController", ["$scope", "$state", templateUrl: '<%= asset_path "wallet/credit_modal.html" %>' controller: ['$scope', '$uibModalInstance', 'Wallet', ($scope, $uibModalInstance, Wallet) -> + # default: do not generate a refund invoice + $scope.generate_avoir = false + + # date of the generated refund invoice + $scope.avoir_date = null + + # optional description shown on the refund invoice + $scope.description = '' + + # default configuration for the avoir date selector widget + $scope.datePicker = + format: Fablab.uibDateFormat + opened: false + options: + startingDay: Fablab.weekStartingDay + + ## + # Callback to open/close the date picker + ## + $scope.toggleDatePicker = ($event) -> + $event.preventDefault() + $event.stopPropagation() + $scope.datePicker.opened = !$scope.datePicker.opened + ## # Modal dialog validation callback ## $scope.ok = -> - Wallet.credit { id: wallet.id }, { amount: $scope.amount }, (_wallet)-> + Wallet.credit { id: wallet.id }, + amount: $scope.amount + avoir: $scope.generate_avoir + avoir_date: $scope.avoir_date + avoir_description: $scope.description + , (_wallet)-> growl.success(_t('wallet_credit_successfully')) $uibModalInstance.close(_wallet) diff --git a/app/assets/templates/wallet/credit_modal.html.erb b/app/assets/templates/wallet/credit_modal.html.erb index 7624e12a9..80e0baf54 100644 --- a/app/assets/templates/wallet/credit_modal.html.erb +++ b/app/assets/templates/wallet/credit_modal.html.erb @@ -3,11 +3,18 @@

{{ 'credit_title' }}

+ +
+ +
{{ 'warning_uneditable_credit' }}
+
+
- {{ 'credit_label' }} + {{'amount_is_required'}} {{ 'amount_minimum_1' | translate }} {{currencySymbol}}.
-
- {{ 'confirm_credit_label' }} +
+ {{'amount_confirm_is_required'}} {{ 'amount_confirm_does_not_match' | translate }}
- -
- -
{{ 'warning_uneditable_credit' }}
-
+
+
+ +
+ +
+
+ +
+
+ +
+ + +
+ {{ 'creation_date_is_required' }} +
+ +
+ +

{{ 'will_appear_on_the_refund_invoice' }}

+ +
+
+
diff --git a/app/controllers/api/invoices_controller.rb b/app/controllers/api/invoices_controller.rb index 22f210a68..2a0712d2e 100644 --- a/app/controllers/api/invoices_controller.rb +++ b/app/controllers/api/invoices_controller.rb @@ -57,7 +57,7 @@ class API::InvoicesController < API::ApiController end - # only for create avoir + # only for create refund invoices (avoir) def create authorize Invoice invoice = Invoice.only_invoice.find(avoir_params[:invoice_id]) diff --git a/app/controllers/api/wallet_controller.rb b/app/controllers/api/wallet_controller.rb index 5ff142155..58f301c1f 100644 --- a/app/controllers/api/wallet_controller.rb +++ b/app/controllers/api/wallet_controller.rb @@ -14,13 +14,22 @@ class API::WalletController < API::ApiController end def credit - @wallet = Wallet.find(params[:id]) + @wallet = Wallet.find(credit_params[:id]) authorize @wallet service = WalletService.new(user: current_user, wallet: @wallet) - if service.credit(params[:amount].to_f) + transaction = service.credit(credit_params[:amount].to_f) + if transaction + if credit_params[:avoir] + service.create_avoir(transaction, credit_params[:avoir_date], credit_params[:avoir_description]) + end render :show else head 422 end end + + private + def credit_params + params.permit(:id, :amount, :avoir, :avoir_date, :avoir_description) + end end diff --git a/app/services/wallet_service.rb b/app/services/wallet_service.rb index 23a824529..0a351d676 100644 --- a/app/services/wallet_service.rb +++ b/app/services/wallet_service.rb @@ -21,7 +21,7 @@ class WalletService end raise ActiveRecord::Rollback end - return false + false end ## debit an amount to wallet, if debit success then return a wallet transaction @@ -35,6 +35,21 @@ class WalletService end raise ActiveRecord::Rollback end - return false + false + end + + ## create a refund invoice associated with the given wallet transaction + def create_avoir(wallet_transaction, avoir_date, description) + avoir = Avoir.new + avoir.type = 'Avoir' + avoir.invoiced = wallet_transaction + avoir.avoir_date = avoir_date + avoir.created_at = avoir_date + avoir.description = description + avoir.avoir_mode = 'wallet' + avoir.subscription_to_expire = false + avoir.user_id = wallet_transaction.wallet.user_id + avoir.total = wallet_transaction.amount * 100.0 + avoir.save! end end diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index 8913ea48e..ffa74c5b3 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -324,6 +324,11 @@ en: credit_title: 'Credit wallet' credit_label: 'Set the amount to be credited' confirm_credit_label: 'Confirm the amount to be credited' + generate_a_refund_invoice: "Generate a refund invoice" + creation_date_for_the_refund: "Creation date for the refund" + creation_date_is_required: "Creation date is required." + description_(optional): "Description (optional):" + will_appear_on_the_refund_invoice: "Will appear on the refund invoice." to_credit: 'Credit' wallet_credit_successfully: "Wallet of user is credited successfully." a_problem_occurred_for_wallet_credit: "A problem is occurred while taking the credit of wallet" diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index fa1cdb010..3f83f502f 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -324,6 +324,11 @@ fr: credit_title: 'Créditer le porte-monnaie' credit_label: 'Indiquez le montant à créditer' confirm_credit_label: 'Confirmez le montant à créditer' + generate_a_refund_invoice: "Générer une facture d'avoir" + creation_date_for_the_refund: "Date d'émission de l'avoir" + creation_date_is_required: "La date d'émission est requise." + description_(optional): "Description (optionnelle) :" + will_appear_on_the_refund_invoice: "Apparaîtra sur la facture de remboursement." to_credit: 'Créditer' wallet_credit_successfully: "Le porte-monnaie de l'utilisateur a été chargé avec succès." a_problem_occurred_for_wallet_credit: "Un problème est survenu lors du chargement du porte-monnaie." From 9190e61f5fd0795deb3e5c4cacb106484ce4965f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 12 Dec 2016 15:32:01 +0100 Subject: [PATCH 135/289] basic avoir invoice for wallet credit --- app/pdfs/pdf/invoice.rb | 16 +++++++++++----- config/locales/en.yml | 1 + config/locales/fr.yml | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/pdfs/pdf/invoice.rb b/app/pdfs/pdf/invoice.rb index ab9b8b20e..6c9dc5eb6 100644 --- a/app/pdfs/pdf/invoice.rb +++ b/app/pdfs/pdf/invoice.rb @@ -37,10 +37,12 @@ module PDF if Setting.find_by({name: 'invoice_code-active'}).value == 'true' text I18n.t('invoices.code', CODE:Setting.find_by({name: 'invoice_code-value'}).value), :leading => 3 end - if invoice.is_a?(Avoir) - text I18n.t('invoices.order_number', NUMBER:invoice.invoice.order_number), :leading => 3 - else - text I18n.t('invoices.order_number', NUMBER:invoice.order_number), :leading => 3 + if invoice.invoiced_type != WalletTransaction.name + if invoice.is_a?(Avoir) + text I18n.t('invoices.order_number', NUMBER:invoice.invoice.order_number), :leading => 3 + else + text I18n.t('invoices.order_number', NUMBER:invoice.order_number), :leading => 3 + end end if invoice.is_a?(Avoir) text I18n.t('invoices.refund_invoice_issued_on_DATE', DATE:I18n.l(invoice.avoir_date.to_date)) @@ -68,7 +70,11 @@ module PDF # object move_down 25 if invoice.is_a?(Avoir) - object = I18n.t('invoices.cancellation_of_invoice_REF', REF: invoice.invoice.reference) + if invoice.invoiced_type == WalletTransaction.name + object = I18n.t('invoices.wallet_credit') + else + object = I18n.t('invoices.cancellation_of_invoice_REF', REF: invoice.invoice.reference) + end else case invoice.invoiced_type when 'Reservation' diff --git a/config/locales/en.yml b/config/locales/en.yml index f30febc5e..7b0f5be86 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -68,6 +68,7 @@ en: order_number: "Order #: %{NUMBER}" invoice_issued_on_DATE: "Invoice issued on %{DATE}" refund_invoice_issued_on_DATE: "Refund invoice issued on %{DATE}" + wallet_credit: "Wallet credit" cancellation_of_invoice_REF: "Cancellation of invoice %{REF}" reservation_of_USER_on_DATE_at_TIME: "Reservation of %{USER} on %{DATE} at %{TIME}" cancellation: "Cancellation" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 68bb7179c..fde68aac2 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -68,6 +68,7 @@ fr: order_number: "N° Commande : %{NUMBER}" invoice_issued_on_DATE: "Facture éditée le %{DATE}" refund_invoice_issued_on_DATE: "Avoir édité le %{DATE}" + wallet_credit: "Crédit du porte-monnaie" cancellation_of_invoice_REF: "Annulation de la facture %{REF}" reservation_of_USER_on_DATE_at_TIME: "Réservation de %{USER} le %{DATE} à %{TIME}" cancellation: "Annulation" From 5a1abe409ad03fa9dafc4a8cb1e2891d8b065725 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 12 Dec 2016 16:44:56 +0100 Subject: [PATCH 136/289] tests for price compute API --- test/integration/prices/compute_test.rb | 82 +++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 test/integration/prices/compute_test.rb diff --git a/test/integration/prices/compute_test.rb b/test/integration/prices/compute_test.rb new file mode 100644 index 000000000..3a0231964 --- /dev/null +++ b/test/integration/prices/compute_test.rb @@ -0,0 +1,82 @@ +module Events + class AsAdminTest < ActionDispatch::IntegrationTest + + setup do + admin = User.with_role(:admin).first + login_as(admin, scope: :user) + end + + test 'compute price for a simple training' do + user = User.find_by(username: 'jdupond') + availability = Availability.find(2) + printer_training = availability.trainings.first + + post '/api/prices/compute', + { + reservation: { + user_id: user.id, + reservable_id: printer_training.id, + reservable_type: printer_training.class.name, + slots_attributes: [ + { + availability_id: availability.id, + end_at: availability.end_at, + offered: false, + start_at: availability.start_at + } + ] + } + }.to_json, + default_headers + + # Check response format & status + assert_equal 200, response.status, response.body + assert_equal Mime::JSON, response.content_type + + # Check the price was computed correctly + price = json_response(response.body) + assert_equal (printer_training.trainings_pricings.where(group_id: user.group_id).first.amount / 100.0), price[:price], 'Computed price did not match training price' + end + + + test 'compute price for a machine reservation with an offered slot and a subscription' do + user = User.find_by(username: 'jdupond') + availability = Availability.find(3) + laser = availability.machines.where(id: 1).first + plan = Plan.where(group_id: user.group_id, interval: 'month').first + + post '/api/prices/compute', + { + reservation: { + user_id: user.id, + reservable_id: laser.id, + reservable_type: laser.class.name, + plan_id: plan.id, + slots_attributes: [ + { + availability_id: availability.id, + end_at: (availability.start_at + 1.hour).strftime('%Y-%m-%d %H:%M:%S.%9N Z'), + offered: true, + start_at: availability.start_at.strftime('%Y-%m-%d %H:%M:%S.%9N Z') + }, + { + availability_id: availability.id, + end_at: (availability.start_at + 2.hour).strftime('%Y-%m-%d %H:%M:%S.%9N Z'), + offered: false, + start_at: (availability.start_at + 1.hour).strftime('%Y-%m-%d %H:%M:%S.%9N Z') + } + ] + } + }.to_json, + default_headers + + # Check response format & status + assert_equal 200, response.status, response.body + assert_equal Mime::JSON, response.content_type + + # Check the event was created correctly + price = json_response(response.body) + assert_equal ((laser.prices.where(group_id: user.group_id, plan_id: plan.id).first.amount + plan.amount) / 100.0), price[:price], 'Computed price did not match machine + subscription price' + end + end +end From 4817da75d633c6dbc0c260f68a7278f465ad5f58 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 13 Dec 2016 10:08:19 +0100 Subject: [PATCH 137/289] [bug] unable to create or edit percentage coupons --- CHANGELOG.md | 1 + app/validators/coupon_discount_validator.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 814cf6e68..bb3db7540 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Improved automated testing - Added an information notice about the processing time of deleting an administrator - Fix a bug: unable to run rake db:migrate on first install +- Fix a bug: unable to create or edit a coupon of type 'percentage' ## v2.4.6 2016 Novembre 30 diff --git a/app/validators/coupon_discount_validator.rb b/app/validators/coupon_discount_validator.rb index 35b81b0f6..072ae089f 100644 --- a/app/validators/coupon_discount_validator.rb +++ b/app/validators/coupon_discount_validator.rb @@ -1,7 +1,7 @@ class CouponDiscountValidator < ActiveModel::Validator def validate(record) if !record.percent_off.nil? - unless [0..100].include? record.percent_off + unless (0..100).include? record.percent_off record.errors[:percent_off] << 'Percentage must be included between 0 and 100' end elsif !record.amount_off.nil? From 85ee73f0e08771767ff24a85b626344d2aaeefc9 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 13 Dec 2016 12:01:34 +0100 Subject: [PATCH 138/289] ability to edit coupon expiration --- .../controllers/admin/coupons.coffee | 4 ++-- .../templates/admin/coupons/_form.html.erb | 1 - app/controllers/api/coupons_controller.rb | 2 +- app/models/coupon.rb | 2 ++ app/validators/coupon_expiration_validator.rb | 19 +++++++++++++++++++ 5 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 app/validators/coupon_expiration_validator.rb diff --git a/app/assets/javascripts/controllers/admin/coupons.coffee b/app/assets/javascripts/controllers/admin/coupons.coffee index 21e0a65ae..5433d4248 100644 --- a/app/assets/javascripts/controllers/admin/coupons.coffee +++ b/app/assets/javascripts/controllers/admin/coupons.coffee @@ -58,8 +58,8 @@ Application.Controllers.controller "NewCouponController", ["$scope", "$state", ' ## # Controller used in the coupon edition page ## -Application.Controllers.controller "EditCouponController", ["$scope", "$state", 'Coupon', 'couponPromise', '_t' -, ($scope, $state, Coupon, couponPromise, _t) -> +Application.Controllers.controller "EditCouponController", ["$scope", "$state", 'Coupon', 'couponPromise', '_t', 'growl' +, ($scope, $state, Coupon, couponPromise, _t, growl) -> ### PUBLIC SCOPE ### diff --git a/app/assets/templates/admin/coupons/_form.html.erb b/app/assets/templates/admin/coupons/_form.html.erb index 4cc92c9f6..87ce08937 100644 --- a/app/assets/templates/admin/coupons/_form.html.erb +++ b/app/assets/templates/admin/coupons/_form.html.erb @@ -92,7 +92,6 @@ datepicker-options="datePicker.options" is-open="datePicker.opened" min-date="datePicker.minDate" - ng-disabled="mode == 'EDIT'" ng-click="toggleDatePicker($event)"/> diff --git a/app/controllers/api/coupons_controller.rb b/app/controllers/api/coupons_controller.rb index 9057a2123..d214f1961 100644 --- a/app/controllers/api/coupons_controller.rb +++ b/app/controllers/api/coupons_controller.rb @@ -90,6 +90,6 @@ class API::CouponsController < API::ApiController end def coupon_editable_params - params.require(:coupon).permit(:name, :active) + params.require(:coupon).permit(:name, :active, :valid_until) end end diff --git a/app/models/coupon.rb b/app/models/coupon.rb index b4fe0a7f8..69b37310e 100644 --- a/app/models/coupon.rb +++ b/app/models/coupon.rb @@ -11,6 +11,7 @@ class Coupon < ActiveRecord::Base validates :validity_per_user, presence: true validates :validity_per_user, inclusion: { in: %w(once forever) } validates_with CouponDiscountValidator + validates_with CouponExpirationValidator def safe_destroy if self.invoices.size == 0 @@ -76,6 +77,7 @@ class Coupon < ActiveRecord::Base attached_object: self end + private def create_stripe_coupon StripeWorker.perform_async(:create_stripe_coupon, id) end diff --git a/app/validators/coupon_expiration_validator.rb b/app/validators/coupon_expiration_validator.rb new file mode 100644 index 000000000..b6ecf3892 --- /dev/null +++ b/app/validators/coupon_expiration_validator.rb @@ -0,0 +1,19 @@ +class CouponExpirationValidator < ActiveModel::Validator + ## + # @param record {Coupon} + ## + def validate(record) + previous = record.valid_until_was + current = record.valid_until + + unless current.blank? + if current.end_of_day < Time.now + record.errors[:valid_until] << 'New expiration date cannot be in the past' + end + + if !previous.blank? and current.end_of_day < previous.end_of_day + record.errors[:valid_until] << 'New expiration date cannot be before the previous one' + end + end + end +end \ No newline at end of file From ecbe8a58a2a6a6142c7f345ea7935e4776139e5d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 13 Dec 2016 12:46:00 +0100 Subject: [PATCH 139/289] coupon edition: display internationalized errors --- CHANGELOG.md | 1 + .../javascripts/controllers/admin/coupons.coffee | 6 +++++- app/assets/templates/admin/coupons/_form.html.erb | 11 ++++++----- app/validators/coupon_discount_validator.rb | 4 ++-- app/validators/coupon_expiration_validator.rb | 4 ++-- config/locales/en.yml | 4 ++++ config/locales/fr.yml | 4 ++++ 7 files changed, 24 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb3db7540..86325760f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## next release - Improved automated testing - Added an information notice about the processing time of deleting an administrator +- Ability to change the expiration date of a coupon after its creation - Fix a bug: unable to run rake db:migrate on first install - Fix a bug: unable to create or edit a coupon of type 'percentage' diff --git a/app/assets/javascripts/controllers/admin/coupons.coffee b/app/assets/javascripts/controllers/admin/coupons.coffee index 5433d4248..c62693e80 100644 --- a/app/assets/javascripts/controllers/admin/coupons.coffee +++ b/app/assets/javascripts/controllers/admin/coupons.coffee @@ -73,6 +73,9 @@ Application.Controllers.controller "EditCouponController", ["$scope", "$state", ## Options for the validity per user $scope.validities = userValidities + ## Mapping for validation errors + $scope.errors = {} + ## Default parameters for AngularUI-Bootstrap datepicker (used for coupon validity limit selection) $scope.datePicker = format: Fablab.uibDateFormat @@ -98,11 +101,12 @@ Application.Controllers.controller "EditCouponController", ["$scope", "$state", # Callback to save the coupon's changes to the API ## $scope.updateCoupon = -> + $scope.errors = {} Coupon.update {id: $scope.coupon.id}, coupon: $scope.coupon, (coupon) -> $state.go('app.admin.pricing') , (err)-> growl.error(_t('unable_to_update_the_coupon_an_error_occurred')) - console.error(err) + $scope.errors = err.data diff --git a/app/assets/templates/admin/coupons/_form.html.erb b/app/assets/templates/admin/coupons/_form.html.erb index 87ce08937..9a54b7995 100644 --- a/app/assets/templates/admin/coupons/_form.html.erb +++ b/app/assets/templates/admin/coupons/_form.html.erb @@ -81,7 +81,7 @@ {{ 'validity_per_user_is_required' }}
-
+
+ {{ errors['valid_until'].join(' ; ') }} - - {{ 'leave_empty_for_no_limit' | translate }} - + + {{ 'leave_empty_for_no_limit' | translate }} +
@@ -113,7 +114,7 @@ min="0"/> {{ 'max_usages_must_be_equal_or_greater_than_0' }} - + {{ 'leave_empty_for_no_limit' | translate }}
diff --git a/app/validators/coupon_discount_validator.rb b/app/validators/coupon_discount_validator.rb index 072ae089f..60a674804 100644 --- a/app/validators/coupon_discount_validator.rb +++ b/app/validators/coupon_discount_validator.rb @@ -2,14 +2,14 @@ class CouponDiscountValidator < ActiveModel::Validator def validate(record) if !record.percent_off.nil? unless (0..100).include? record.percent_off - record.errors[:percent_off] << 'Percentage must be included between 0 and 100' + record.errors[:percent_off] << I18n.t('errors.messages.percentage_out_of_range') end elsif !record.amount_off.nil? unless record.amount_off > 0 record.errors[:amount_off] << I18n.t('errors.messages.greater_than_or_equal_to', count: 0) end else - record.errors[:percent_off] << 'cannot be blank when amount_off is blank too' + record.errors[:percent_off] << I18n.t('errors.messages.cannot_be_blank_at_same_time', field: 'amount_off') end end end \ No newline at end of file diff --git a/app/validators/coupon_expiration_validator.rb b/app/validators/coupon_expiration_validator.rb index b6ecf3892..d9a80f55e 100644 --- a/app/validators/coupon_expiration_validator.rb +++ b/app/validators/coupon_expiration_validator.rb @@ -8,11 +8,11 @@ class CouponExpirationValidator < ActiveModel::Validator unless current.blank? if current.end_of_day < Time.now - record.errors[:valid_until] << 'New expiration date cannot be in the past' + record.errors[:valid_until] << I18n.t('errors.messages.cannot_be_in_the_past') end if !previous.blank? and current.end_of_day < previous.end_of_day - record.errors[:valid_until] << 'New expiration date cannot be before the previous one' + record.errors[:valid_until] << I18n.t('errors.messages.cannot_be_before_previous_value') end end end diff --git a/config/locales/en.yml b/config/locales/en.yml index f30febc5e..11dbd5fd8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -32,6 +32,10 @@ en: size_too_small: "is too small (should be at least %{file_size})" size_too_big: "is too big (should be at most %{file_size})" export_not_found: "Requested export was not found. It was probably deleted, please generate a new export." + percentage_out_of_range: "Percentage must be included between 0 and 100" + cannot_be_blank_at_same_time: "cannot be blank when %{field} is blank too" + cannot_be_in_the_past: "cannot be in the past" + cannot_be_before_previous_value: "cannot be before the previous value" activemodel: errors: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 68bb7179c..1cebdb59d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -32,6 +32,10 @@ fr: size_too_small: "est trop petite (au moins %{file_size})" size_too_big: "est trop grande (pas plus de %{file_size})" export_not_found: "L'export demandé n'a pas été trouvé. Il a probablement été supprimé, veuillez lancer la génération d'un nouvel export." + percentage_out_of_range: "Le pourcentage doit être inclus entre 0 et 100" + cannot_be_blank_at_same_time: "ou %{field} doit être rempli(e)" + cannot_be_in_the_past: "ne peut pas être dans le passé" + cannot_be_before_previous_value: "ne peut pas être antérieur(e) à la valeur précédente" activemodel: errors: From 3cdbecf74a6417ff2b46bda8915ab064c3ca8420 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 13 Dec 2016 15:05:40 +0100 Subject: [PATCH 140/289] add invoice item to refund invoices for wallet credit --- app/pdfs/pdf/invoice.rb | 5 ++++- app/services/wallet_service.rb | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/pdfs/pdf/invoice.rb b/app/pdfs/pdf/invoice.rb index 6c9dc5eb6..faf79f42d 100644 --- a/app/pdfs/pdf/invoice.rb +++ b/app/pdfs/pdf/invoice.rb @@ -121,7 +121,7 @@ module PDF else ### Reservation - case invoice.invoiced.reservable_type + case invoice.invoiced.try(:reservable_type) ### Machine reservation when 'Machine' details += I18n.t('invoices.machine_reservation_DESCRIPTION', DESCRIPTION: item.description) @@ -136,6 +136,9 @@ module PDF invoice.invoiced.tickets.each do |t| details += "\n "+I18n.t('invoices.other_rate_ticket', count: t.booked, NAME: t.event_price_category.price_category.name) end + ### wallet credit + when nil + details = item.description ### Other cases (not expected) else diff --git a/app/services/wallet_service.rb b/app/services/wallet_service.rb index 0a351d676..c8ebea8be 100644 --- a/app/services/wallet_service.rb +++ b/app/services/wallet_service.rb @@ -51,5 +51,11 @@ class WalletService avoir.user_id = wallet_transaction.wallet.user_id avoir.total = wallet_transaction.amount * 100.0 avoir.save! + + ii = InvoiceItem.new + ii.amount = wallet_transaction.amount * 100.0 + ii.description = I18n.t('invoices.wallet_credit') + ii.invoice = avoir + ii.save! end end From 853cc67ee3f935e83dbdee2fb5b9da688e43f48a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 13 Dec 2016 15:33:24 +0100 Subject: [PATCH 141/289] add nomal coupon test --- test/models/coupon_test.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/models/coupon_test.rb b/test/models/coupon_test.rb index f1cef7ee7..d7358357a 100644 --- a/test/models/coupon_test.rb +++ b/test/models/coupon_test.rb @@ -1,6 +1,14 @@ require 'test_helper' class CouponTest < ActiveSupport::TestCase + + test 'valid coupon with percentage' do + c = Coupon.new({name: 'Hot deals', code: 'HOT15', percent_off: 15, validity_per_user: 'once', valid_until: (Time.now + 2.weeks), max_usages: 100, active: true}) + assert c.valid? + assert_equal 'active', c.status, 'Invalid coupon status' + assert_equal 'percent_off', c.type, 'Invalid coupon type' + end + test 'coupon must have a valid percentage' do c = Coupon.new({name: 'Amazing deal', code: 'DISCOUNT', percent_off: 200, validity_per_user: 'once'}) assert c.invalid? From c582d4665d4c2f1bf84f4aecb955cfde97f5d36f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 13 Dec 2016 15:37:43 +0100 Subject: [PATCH 142/289] improved cash coupon test --- test/models/coupon_test.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/models/coupon_test.rb b/test/models/coupon_test.rb index d7358357a..1c8ade1a5 100644 --- a/test/models/coupon_test.rb +++ b/test/models/coupon_test.rb @@ -24,9 +24,11 @@ class CouponTest < ActiveSupport::TestCase assert c.invalid? end - test 'coupon with cash amount has amount_off type' do - c = Coupon.new({name: 'Essential Box', code: 'KWXX2M', amount_off: 2000, validity_per_user: 'once', max_usages: 1}) - assert_equal 'amount_off', c.type + test 'valid coupon with cash amount' do + c = Coupon.new({name: 'Essential Box', code: 'KWXX2M', amount_off: 2000, validity_per_user: 'once', max_usages: 1, active: true}) + assert c.valid? + assert_equal 'active', c.status, 'Invalid coupon status' + assert_equal 'amount_off', c.type, 'Invalid coupon type' end test 'coupon with cash amount cannot be used with cheaper cart' do From df411b10b249f7e13e245b61b52246206450fb96 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 13 Dec 2016 16:00:12 +0100 Subject: [PATCH 143/289] test wallet credit with refund invoice generation --- test/integration/wallets_test.rb | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/test/integration/wallets_test.rb b/test/integration/wallets_test.rb index 19a68a1fa..d279edc28 100644 --- a/test/integration/wallets_test.rb +++ b/test/integration/wallets_test.rb @@ -74,5 +74,38 @@ class WalletsTest < ActionDispatch::IntegrationTest w.reload assert_equal w.amount, expected_amount assert_equal w.amount, wallet[:amount] + + # no refund invoices should have been generated + assert_empty Invoice.where(invoiced: w.wallet_transactions.last) + end + + + test 'admin credit wallet with refund invoice generation' do + admin = users(:user_1) + login_as(admin, scope: :user) + w = @vlonchamp.wallet + amount = 10 + avoir_date = Time.now.end_of_day + expected_amount = w.amount + amount + put "/api/wallet/#{w.id}/credit", + { + amount: amount, + avoir: true, + avoir_date: avoir_date, + avoir_description: 'Some text' + } + + assert_equal 200, response.status + assert_equal Mime::JSON, response.content_type + wallet = json_response(response.body) + w.reload + assert_equal w.amount, expected_amount + assert_equal w.amount, wallet[:amount] + + # refund invoice must be generated + invoice = Invoice.where(invoiced: w.wallet_transactions.last).first + assert_equal amount, (invoice.total / 100.0), 'Avoir total does not match the amount credited to the wallet' + assert_equal amount, (invoice.invoice_items.first.amount / 100.0), 'Invoice item amount does not match' + assert_invoice_pdf invoice end end From 34e04845bb60ec66ae6e5f6806506119270b819f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 14 Dec 2016 10:41:17 +0100 Subject: [PATCH 144/289] Version 2.4.7 --- .fabmanager-version | 2 +- CHANGELOG.md | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.fabmanager-version b/.fabmanager-version index 9c9c84e9e..48a6b508d 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.7-dev \ No newline at end of file +2.4.7 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 86325760f..e2922cf17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,15 @@ # Changelog Fab Manager -## next release +## v2.4.7 2016 December 14 + - Improved automated testing - Added an information notice about the processing time of deleting an administrator - Ability to change the expiration date of a coupon after its creation +- Ability to generate a refund invoice when crediting user's wallet - Fix a bug: unable to run rake db:migrate on first install - Fix a bug: unable to create or edit a coupon of type 'percentage' -## v2.4.6 2016 Novembre 30 +## v2.4.6 2016 November 30 - Change display of message about coupon application status - Fix a bug: compute price API return error 500 if reservable_id is not provided From 531a89945b3d2f1ee84b6241a3ed0f926b31529f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 14 Dec 2016 13:05:42 +0100 Subject: [PATCH 145/289] member form: add asterisks on mendatory fields --- .../templates/shared/_member_form.html.erb | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app/assets/templates/shared/_member_form.html.erb b/app/assets/templates/shared/_member_form.html.erb index f1e4683c6..ac40d0053 100644 --- a/app/assets/templates/shared/_member_form.html.erb +++ b/app/assets/templates/shared/_member_form.html.erb @@ -55,13 +55,16 @@ ng-disabled="preventField['profile.gender'] && user.profile.gender && !userForm['user[profile_attributes][gender]'].$dirty"/> {{ 'woman' | translate }} - {{ 'gender_is_required' }} + + + {{ 'gender_is_required' }}
- + +
- +
- +
- +
- +
- +
- + @@ -181,7 +184,7 @@
- + @@ -198,7 +201,7 @@
- +
- + Date: Wed, 14 Dec 2016 15:14:33 +0100 Subject: [PATCH 146/289] sso wording --- app/assets/templates/profile/complete.html.erb | 2 +- config/locales/app.logged.en.yml | 4 ++-- config/locales/app.logged.fr.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/templates/profile/complete.html.erb b/app/assets/templates/profile/complete.html.erb index 65c1b99ab..8101e158b 100644 --- a/app/assets/templates/profile/complete.html.erb +++ b/app/assets/templates/profile/complete.html.erb @@ -28,7 +28,7 @@ {{ 'you_ve_just_created_a_new_account_on_the_fablab_by_logging_from' | translate:{ GENDER: nameGenre, NAME: fablabName }:"messageformat" }}
{{activeProvider.name}} ({{ssoEmail()}})
-

{{ 'before_letting_you_use_the_application_we_need_some_more_details' }}.

+

{{ 'we_need_some_more_details' }}.

{{ 'your_email_is_already_used_by_another_account_on_the_platform' }}

diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml index b0195a92f..533e1bbe7 100644 --- a/config/locales/app.logged.en.yml +++ b/config/locales/app.logged.en.yml @@ -5,8 +5,8 @@ en: # user's profile completion page when logging from an SSO provider confirm_your_new_account: "Confirm your new account" you_ve_just_created_a_new_account_on_the_fablab_by_logging_from: "You've just created a new account on the {NAME}, by logging from" # messageFormat interpolation - before_letting_you_use_the_application_we_need_some_more_details: "Before letting you use the application, we need some more details" - your_email_is_already_used_by_another_account_on_the_platform: "But wait, there is a problem! Your email is already used by another account on the platform." + we_need_some_more_details: "To finalize the platform setup, we need some more details" + your_email_is_already_used_by_another_account_on_the_platform: "It looks like your email address is already used by another user. Check your email address and please input below the code sent to you." please_fill_the_following_form: "Please fill the following form" some_data_may_have_already_been_provided_by_provider_and_cannot_be_modified: "Some data may have already been provided by {{NAME}} and cannot be modified" # angular interpolation then_click_on_: "Then click on" diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index 84420ce1c..ea0e901dc 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -5,8 +5,8 @@ fr: # page de complétion du profil utilisateur, à la première connexion depuis un SSO confirm_your_new_account: "Confirmez votre nouveau compte" you_ve_just_created_a_new_account_on_the_fablab_by_logging_from: "Vous venez de créer un nouveau compte sur {GENDER, select, male{le} female{la} other{les}} {NAME}, en vous connectant depuis" # messageFormat interpolation - before_letting_you_use_the_application_we_need_some_more_details: "Avant de vous laisser utiliser l'application, nous avons besoin de quelques renseignements supplémentaires" - your_email_is_already_used_by_another_account_on_the_platform: "Mais attendez, il y a un problème ! Votre adresse de courriel est déjà utilisée par un autre compte sur cette plate-forme." + we_need_some_more_details: "Afin de finaliser le paramétrage de la plate-forme, nous avons besoin de quelques renseignements supplémentaires" + your_email_is_already_used_by_another_account_on_the_platform: "Il semblerait que votre adresse de courriel soit déjà utilisée par un autre utilisateur. Vérifiez votre adresse électronique et veuillez saisir ci-dessous le code qui vient de vous être envoyé." please_fill_the_following_form: "Merci de compléter le formulaire suivant" some_data_may_have_already_been_provided_by_provider_and_cannot_be_modified: "Certaines informations peuvent nous avoir été déjà fournies par {{NAME}} et ne sont pas modifiables" # angular interpolation then_click_on_: "Cliquez ensuite sur" From a7fdc4d7414f2468d175687a89b76782b676eb9b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 14 Dec 2016 15:55:12 +0100 Subject: [PATCH 147/289] fix potentital issue with sso + enterprise profile --- app/views/api/members/show.json.jbuilder | 2 +- db/schema.rb | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/views/api/members/show.json.jbuilder b/app/views/api/members/show.json.jbuilder index 8f061f96a..7f417dffe 100644 --- a/app/views/api/members/show.json.jbuilder +++ b/app/views/api/members/show.json.jbuilder @@ -30,7 +30,7 @@ json.profile do json.address do json.id @member.profile.organization.address.id json.address @member.profile.organization.address.address - end + end if @member.profile.organization.address end if @member.profile.organization end diff --git a/db/schema.rb b/db/schema.rb index f42f20eb9..1b7f84d7f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -289,7 +289,7 @@ ActiveRecord::Schema.define(version: 20161123104604) do t.boolean "is_read", default: false t.datetime "created_at" t.datetime "updated_at" - t.string "receiver_type" + t.string "receiver_type", limit: 255 t.boolean "is_send", default: false t.jsonb "meta_data", default: {} end @@ -320,7 +320,6 @@ ActiveRecord::Schema.define(version: 20161123104604) do t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "profile_url" - t.string "logout_endpoint" end create_table "offer_days", force: :cascade do |t| @@ -467,7 +466,7 @@ ActiveRecord::Schema.define(version: 20161123104604) do t.datetime "published_at" end - add_index "projects", ["slug"], name: "index_projects_on_slug", using: :btree + add_index "projects", ["slug"], name: "index_projects_on_slug", unique: true, using: :btree create_table "projects_components", force: :cascade do |t| t.integer "project_id" @@ -536,8 +535,8 @@ ActiveRecord::Schema.define(version: 20161123104604) do t.datetime "updated_at" t.integer "availability_id" t.datetime "ex_start_at" - t.datetime "ex_end_at" t.datetime "canceled_at" + t.datetime "ex_end_at" t.boolean "offered", default: false end @@ -719,6 +718,7 @@ ActiveRecord::Schema.define(version: 20161123104604) do add_index "user_trainings", ["user_id"], name: "index_user_trainings_on_user_id", using: :btree create_table "users", force: :cascade do |t| + t.string "username", limit: 255 t.string "email", limit: 255, default: "", null: false t.string "encrypted_password", limit: 255, default: "", null: false t.string "reset_password_token", limit: 255 @@ -741,7 +741,6 @@ ActiveRecord::Schema.define(version: 20161123104604) do t.boolean "is_allow_contact", default: true t.integer "group_id" t.string "stp_customer_id", limit: 255 - t.string "username", limit: 255 t.string "slug", limit: 255 t.boolean "is_active", default: true t.boolean "invoicing_disabled", default: false From 5e1b85832c0f5361d418cc790b66c29b26c645bb Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 14 Dec 2016 17:14:53 +0100 Subject: [PATCH 148/289] [ongoing] resend sso fusion token --- .../{profile.coffee => profile.coffee.erb} | 26 +++++++++++++++++-- app/assets/templates/profile/_token.html.erb | 1 + .../templates/profile/resend_code_modal.html | 26 +++++++++++++++++++ config/locales/app.logged.en.yml | 3 +++ config/locales/app.logged.fr.yml | 3 +++ 5 files changed, 57 insertions(+), 2 deletions(-) rename app/assets/javascripts/controllers/{profile.coffee => profile.coffee.erb} (87%) create mode 100644 app/assets/templates/profile/resend_code_modal.html diff --git a/app/assets/javascripts/controllers/profile.coffee b/app/assets/javascripts/controllers/profile.coffee.erb similarity index 87% rename from app/assets/javascripts/controllers/profile.coffee rename to app/assets/javascripts/controllers/profile.coffee.erb index f2f542b31..e883d8dfb 100644 --- a/app/assets/javascripts/controllers/profile.coffee +++ b/app/assets/javascripts/controllers/profile.coffee.erb @@ -1,8 +1,8 @@ 'use strict' -Application.Controllers.controller "CompleteProfileController", ["$scope", "$rootScope", "$state", "$window", "_t", "growl", "CSRF", "Auth", "Member", "settingsPromise", "activeProviderPromise", "groupsPromise", "cguFile", "memberPromise", "Session" -, ($scope, $rootScope, $state, $window, _t, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise, Session) -> +Application.Controllers.controller "CompleteProfileController", ["$scope", "$rootScope", "$state", "$window", "_t", "growl", "CSRF", "Auth", "Member", "settingsPromise", "activeProviderPromise", "groupsPromise", "cguFile", "memberPromise", "Session", "dialogs" +, ($scope, $rootScope, $state, $window, _t, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise, Session, dialogs) -> @@ -141,6 +141,28 @@ Application.Controllers.controller "CompleteProfileController", ["$scope", "$roo + ## + # Ask for email confirmation and send the SSO merging token again + # @param $event {Object} jQuery event object + ## + $scope.resendCode = (event) -> + event.preventDefault() + event.stopPropagation() + # TODO show modal only IF email is not mapped to sso OR email = null + dialogs.confirm + templateUrl: '<%= asset_path "profile/resend_code_modal.html" %>' + resolve: + object: -> + email: memberPromise.email + , (email) -> + console.log(email) + # TODO update email + # TODO in every cases, resend email + # TODO growl result + + + + ## # Disconnect and re-connect the user to the SSO to force the synchronisation of the profile's data ## diff --git a/app/assets/templates/profile/_token.html.erb b/app/assets/templates/profile/_token.html.erb index f4a8b0404..3017b18ed 100644 --- a/app/assets/templates/profile/_token.html.erb +++ b/app/assets/templates/profile/_token.html.erb @@ -3,6 +3,7 @@

{{ 'do_you_already_have_an_account' }}

{{ 'do_not_fill_the_form_beside_but_specify_here_the_code_you_ve_received_by_email_to_recover_your_access' }}

{{ 'just_specify_code_here_to_recover_access' }}

+

{{ 'i_did_not_receive_the_code' }}

diff --git a/app/assets/templates/profile/resend_code_modal.html b/app/assets/templates/profile/resend_code_modal.html new file mode 100644 index 000000000..427d381ae --- /dev/null +++ b/app/assets/templates/profile/resend_code_modal.html @@ -0,0 +1,26 @@ +
+ +

{{ 'send_code_again' }}

+
+
+ +
+ +
+ + +
+ {{'email_is_required'}} + {{'email_format_is_incorrect'}} +
+ +
+
+ + +
diff --git a/config/locales/app.logged.en.yml b/config/locales/app.logged.en.yml index 533e1bbe7..8a5e26a31 100644 --- a/config/locales/app.logged.en.yml +++ b/config/locales/app.logged.en.yml @@ -18,9 +18,12 @@ en: do_you_already_have_an_account: "Do you already have an account?" do_not_fill_the_form_beside_but_specify_here_the_code_you_ve_received_by_email_to_recover_your_access: "Do not fill the form beside but specify here the code you've received by email, to recover your access." just_specify_code_here_to_recover_access: "Just specify here the code you've received by email to recover your access." + i_did_not_receive_the_code: "I didn't receive the code" authentification_code: "Authentification code" confirm_my_code: "Confirm my code" an_unexpected_error_occurred_check_your_authentication_code: "An unexpected error occurred, please check your authentication code." + send_code_again: "Send the code again" + email_format_is_incorrect: "Email format is incorrect" dashboard: # dashboard: public profile diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index ea0e901dc..b3e8aeab5 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -18,9 +18,12 @@ fr: do_you_already_have_an_account: "Vous possédez déjà un compte ?" do_not_fill_the_form_beside_but_specify_here_the_code_you_ve_received_by_email_to_recover_your_access: "Ne remplissez pas le formulaire à gauche mais indiquez ici le code qui vous a été fourni par e-mail, cela vous permettra de récupérer l'accès à votre compte." just_specify_code_here_to_recover_access: "Indiquez simplement ici le code que vous avez reçu par e-mail, cela vous permettra de récupérer l'accès à votre compte." + i_did_not_receive_the_code: "Je n'ai pas reçu le code" authentification_code: "Code d'authentification" confirm_my_code: "Valider mon code" an_unexpected_error_occurred_check_your_authentication_code: "Une erreur inattendue est survenue, vérifiez votre code d'authentification." + send_code_again: "Renvoyer le code" + email_format_is_incorrect: "Le format de l'adresse email est incorrect" dashboard: # tableau de bord: profile publique From 102eecdc8a4d8239a57e92d12e8c259b4ebad304 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 15 Dec 2016 14:16:24 +0100 Subject: [PATCH 149/289] ability to send again auth migration code --- .../controllers/profile.coffee.erb | 15 +++++++------- .../javascripts/services/authProvider.coffee | 3 +++ .../templates/profile/resend_code_modal.html | 2 +- .../api/auth_providers_controller.rb | 20 ++++++++++++++++++- app/policies/auth_provider_policy.rb | 3 +++ config/locales/app.logged.en.yml | 2 ++ config/locales/app.logged.fr.yml | 2 ++ config/locales/en.yml | 2 ++ config/locales/fr.yml | 2 ++ config/routes.rb | 1 + 10 files changed, 42 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/controllers/profile.coffee.erb b/app/assets/javascripts/controllers/profile.coffee.erb index e883d8dfb..781f12995 100644 --- a/app/assets/javascripts/controllers/profile.coffee.erb +++ b/app/assets/javascripts/controllers/profile.coffee.erb @@ -1,8 +1,8 @@ 'use strict' -Application.Controllers.controller "CompleteProfileController", ["$scope", "$rootScope", "$state", "$window", "_t", "growl", "CSRF", "Auth", "Member", "settingsPromise", "activeProviderPromise", "groupsPromise", "cguFile", "memberPromise", "Session", "dialogs" -, ($scope, $rootScope, $state, $window, _t, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise, Session, dialogs) -> +Application.Controllers.controller "CompleteProfileController", ["$scope", "$rootScope", "$state", "$window", "_t", "growl", "CSRF", "Auth", "Member", "settingsPromise", "activeProviderPromise", "groupsPromise", "cguFile", "memberPromise", "Session", "dialogs", "AuthProvider" +, ($scope, $rootScope, $state, $window, _t, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise, Session, dialogs, AuthProvider) -> @@ -148,18 +148,17 @@ Application.Controllers.controller "CompleteProfileController", ["$scope", "$roo $scope.resendCode = (event) -> event.preventDefault() event.stopPropagation() - # TODO show modal only IF email is not mapped to sso OR email = null dialogs.confirm templateUrl: '<%= asset_path "profile/resend_code_modal.html" %>' resolve: object: -> email: memberPromise.email , (email) -> - console.log(email) - # TODO update email - # TODO in every cases, resend email - # TODO growl result - + # Request the server to send an auth-migration email to the current user + AuthProvider.send_code {email: email}, (res) -> + growl.info(_t('code_successfully_sent_again')) + , (err) -> + growl.error(err.data.error) diff --git a/app/assets/javascripts/services/authProvider.coffee b/app/assets/javascripts/services/authProvider.coffee index 4acb0b731..e9928ba8f 100644 --- a/app/assets/javascripts/services/authProvider.coffee +++ b/app/assets/javascripts/services/authProvider.coffee @@ -11,4 +11,7 @@ Application.Services.factory 'AuthProvider', ["$resource", ($resource)-> active: method: 'GET' url: '/api/auth_providers/active' + send_code: + method: 'POST' + url: '/api/auth_providers/send_code' ] diff --git a/app/assets/templates/profile/resend_code_modal.html b/app/assets/templates/profile/resend_code_modal.html index 427d381ae..b3e04dd02 100644 --- a/app/assets/templates/profile/resend_code_modal.html +++ b/app/assets/templates/profile/resend_code_modal.html @@ -5,7 +5,7 @@
- +
Date: Thu, 15 Dec 2016 14:19:55 +0100 Subject: [PATCH 150/289] updated changelog --- .fabmanager-version | 2 +- CHANGELOG.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.fabmanager-version b/.fabmanager-version index 48a6b508d..98fbb71cc 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.7 \ No newline at end of file +2.4.8-dev \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index e2922cf17..4da49ae12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog Fab Manager +## next release +- Added asterisks on mandatory fields in member's form +- Fixed wording on SSO screens +- Ability to send again the auth-system migration token by email + ## v2.4.7 2016 December 14 - Improved automated testing From 12aaa7007c13759c129816954b5eb35c3a4fe2dc Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 15 Dec 2016 14:27:58 +0100 Subject: [PATCH 151/289] fix a bug about notification email for refunf invoices --- CHANGELOG.md | 1 + config/locales/mails.en.yml | 2 +- config/locales/mails.fr.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4da49ae12..c74a72ef5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Added asterisks on mandatory fields in member's form - Fixed wording on SSO screens - Ability to send again the auth-system migration token by email +- Fix a bug: notification email about refund invoice tells about subscription while concerning wallet credit ## v2.4.7 2016 December 14 diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml index 56b7901f3..5aac5158e 100644 --- a/config/locales/mails.en.yml +++ b/config/locales/mails.en.yml @@ -140,7 +140,7 @@ en: notify_member_avoir_ready: subject: "Your FabLab's refund invoice" body: - please_find_attached_html: "Please find as attached file your refund invoice from {DATE}, with an amount of {AMOUNT} concerning your {TYPE, select, Reservation{reservation} other{subscription}}." # messageFormat interpolation + please_find_attached_html: "Please find as attached file your refund invoice from {DATE}, with an amount of {AMOUNT} concerning your {TYPE, select, Reservation{reservation} WalletTransaction{wallet credit} other{subscription}}." # messageFormat interpolation invoice_in_your_dashboard_html: "You can access your refund invoice in %{DASHBOARD} on the Fab Lab website." your_dashboard: "your dashboard" diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index a34aff9c6..0469bd941 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -140,7 +140,7 @@ fr: notify_member_avoir_ready: subject: "Votre facture d'avoir du FabLab" body: - please_find_attached_html: "Vous trouverez en pièce jointe votre facture d'avoir du {DATE}, d'un montant de {AMOUNT} concernant votre {TYPE, select, Reservation{réservation} other{abonnement}}." # messageFormat interpolation + please_find_attached_html: "Vous trouverez en pièce jointe votre facture d'avoir du {DATE}, d'un montant de {AMOUNT} concernant votre {TYPE, select, Reservation{réservation} WalletTransaction{crédit du porte-monnaie} other{abonnement}}." # messageFormat interpolation invoice_in_your_dashboard_html: "Vous pouvez à tout moment retrouver votre facture d'avoir dans %{DASHBOARD} sur le site du Fab Lab." your_dashboard: "votre tableau de bord" From 7926d7a04a2f94a3235c350af3e0fadeb06a0d9e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 15 Dec 2016 17:12:07 +0100 Subject: [PATCH 152/289] Version 2.4.8 --- .fabmanager-version | 2 +- CHANGELOG.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.fabmanager-version b/.fabmanager-version index 98fbb71cc..752a79ef3 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.8-dev \ No newline at end of file +2.4.8 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index c74a72ef5..81f6f2238 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog Fab Manager -## next release +## v2.4.8 2016 December 15 + - Added asterisks on mandatory fields in member's form - Fixed wording on SSO screens - Ability to send again the auth-system migration token by email From 9bfaaaccd963d2c1d639d1e256d1e5f1092312b2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 19 Dec 2016 17:08:11 +0100 Subject: [PATCH 153/289] improved numerous notifications display --- CHANGELOG.md | 4 ++++ app/assets/javascripts/controllers/application.coffee.erb | 7 ++++++- app/controllers/api/notifications_controller.rb | 6 +++++- config/locales/app.public.en.yml | 3 +++ config/locales/app.public.fr.yml | 4 ++++ 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81f6f2238..6b7279958 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog Fab Manager +## next release +- Mask new notifications alerts when more than 3 +- Fix a bug: display more than 15 unread notifications (number on the bell icon & full list) + ## v2.4.8 2016 December 15 - Added asterisks on mandatory fields in member's form diff --git a/app/assets/javascripts/controllers/application.coffee.erb b/app/assets/javascripts/controllers/application.coffee.erb index 51c42a6a3..645b6e6cb 100644 --- a/app/assets/javascripts/controllers/application.coffee.erb +++ b/app/assets/javascripts/controllers/application.coffee.erb @@ -260,7 +260,9 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco getNotifications = -> $rootScope.toCheckNotifications = true unless $rootScope.checkNotificationsIsInit or !$rootScope.currentUser - $scope.notifications = Notification.query {is_read: false} + setTimeout -> + $scope.notifications = Notification.query {is_read: false} + , 2000 $scope.$watch 'notifications', (newValue, oldValue) -> diff = [] angular.forEach newValue, (value) -> @@ -273,6 +275,9 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco unless find diff.push(value) + remain = 3 + if diff.length >= remain + diff.splice(remain, (diff.length - remain), {message: {description: _t('and_NUMBER_other_notifications', {NUMBER: diff.length - remain})}}) angular.forEach diff, (notification, key) -> growl.info(notification.message.description) diff --git a/app/controllers/api/notifications_controller.rb b/app/controllers/api/notifications_controller.rb index a9121d91e..0c242ff6c 100644 --- a/app/controllers/api/notifications_controller.rb +++ b/app/controllers/api/notifications_controller.rb @@ -4,7 +4,11 @@ class API::NotificationsController < API::ApiController def index if params[:is_read] - @notifications = current_user.notifications.where(is_read: params[:is_read] == 'true').page(params[:page]).per(15).order('created_at DESC') + if params[:is_read] == 'true' + @notifications = current_user.notifications.where(is_read: true).page(params[:page]).per(15).order('created_at DESC') + else + @notifications = current_user.notifications.where(is_read: false).order('created_at DESC') + end else @notifications = current_user.notifications.order('created_at DESC') end diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index 5a3e7d1f0..7221927ab 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -103,6 +103,9 @@ en: # Fab-manager's version version: "Version:" + # Notifications + and_NUMBER_other_notifications: "and {{NUMBER}} other notifications..." # angular interpolation + about: # about page read_the_fablab_policy: "Read the FabLab policy" diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 27d7d2b5b..ad2eaeeab 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -102,6 +102,10 @@ fr: # Fab-manager's version version: "Version :" + + # Notifications + and_NUMBER_other_notifications: "et {{NUMBER}} autres notifications ..." # angular interpolation + about: # page à propos read_the_fablab_policy: "Consulter les règles d'utilisation du Fab Lab" From 1f0da1194bbab7435b25938b6ce9be600029de0f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 2 Jan 2017 11:08:40 +0100 Subject: [PATCH 154/289] [bug] fix VAT amount in invoice config --- CHANGELOG.md | 1 + app/assets/templates/admin/invoices/index.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b7279958..71a0a2d0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## next release - Mask new notifications alerts when more than 3 - Fix a bug: display more than 15 unread notifications (number on the bell icon & full list) +- Fix a bug: in invoice configuration panel, VAT amount and total excl. taxes are inverted ## v2.4.8 2016 December 15 diff --git a/app/assets/templates/admin/invoices/index.html.erb b/app/assets/templates/admin/invoices/index.html.erb index c4e47ff7d..a421d2286 100644 --- a/app/assets/templates/admin/invoices/index.html.erb +++ b/app/assets/templates/admin/invoices/index.html.erb @@ -157,11 +157,11 @@ {{ 'including_VAT' | translate }} {{invoice.VAT.rate}} % - {{30/(invoice.VAT.rate/100+1) | currency}} + {{30-(30/(invoice.VAT.rate/100+1)) | currency}} {{ 'including_total_excluding_taxes' }} - {{30-(30/(invoice.VAT.rate/100+1)) | currency}} + {{30/(invoice.VAT.rate/100+1) | currency}} {{ 'including_amount_payed_on_ordering' }} From a39be147188a981c6b87db470823477446109ea3 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 2 Jan 2017 15:56:52 +0100 Subject: [PATCH 155/289] fix number of remaining notifications --- app/assets/javascripts/controllers/application.coffee.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/controllers/application.coffee.erb b/app/assets/javascripts/controllers/application.coffee.erb index 645b6e6cb..ad23759bc 100644 --- a/app/assets/javascripts/controllers/application.coffee.erb +++ b/app/assets/javascripts/controllers/application.coffee.erb @@ -277,7 +277,7 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco remain = 3 if diff.length >= remain - diff.splice(remain, (diff.length - remain), {message: {description: _t('and_NUMBER_other_notifications', {NUMBER: diff.length - remain})}}) + diff.splice(remain, (diff.length - remain), {message: {description: _t('and_NUMBER_other_notifications', {NUMBER: diff.length - remain + 1})}}) angular.forEach diff, (notification, key) -> growl.info(notification.message.description) From 94abdb9eecfef402e3eafee113e174c050f82b3b Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 2 Jan 2017 17:01:52 +0100 Subject: [PATCH 156/289] revert last commit --- app/assets/javascripts/controllers/application.coffee.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/controllers/application.coffee.erb b/app/assets/javascripts/controllers/application.coffee.erb index ad23759bc..645b6e6cb 100644 --- a/app/assets/javascripts/controllers/application.coffee.erb +++ b/app/assets/javascripts/controllers/application.coffee.erb @@ -277,7 +277,7 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco remain = 3 if diff.length >= remain - diff.splice(remain, (diff.length - remain), {message: {description: _t('and_NUMBER_other_notifications', {NUMBER: diff.length - remain + 1})}}) + diff.splice(remain, (diff.length - remain), {message: {description: _t('and_NUMBER_other_notifications', {NUMBER: diff.length - remain})}}) angular.forEach diff, (notification, key) -> growl.info(notification.message.description) From d5c5e369653e4f5d8a53165c072ace5129ccc118 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Jan 2017 11:24:14 +0100 Subject: [PATCH 157/289] [bug] compute age of users born on 29/02, lead to app crash on non-leap years --- CHANGELOG.md | 1 + app/models/profile.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71a0a2d0e..a3b767a4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Mask new notifications alerts when more than 3 - Fix a bug: display more than 15 unread notifications (number on the bell icon & full list) - Fix a bug: in invoice configuration panel, VAT amount and total excl. taxes are inverted +- Fix a bug: unable to compute user's age when they were born on february 29th and current year is not a leap year ## v2.4.8 2016 December 15 diff --git a/app/models/profile.rb b/app/models/profile.rb index 483fbee71..073ed582f 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -28,7 +28,7 @@ class Profile < ActiveRecord::Base def age if birthday.present? now = Time.now.utc.to_date - now.year - birthday.year - (birthday.to_date.change(:year => now.year) > now ? 1 : 0) + (now - birthday).to_f / 365.2425 else '' end From 733a552c60d5da30e3e1a651e41142be29caf8d9 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Jan 2017 11:25:46 +0100 Subject: [PATCH 158/289] invalid default mime type in checking list --- config/application.yml.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.yml.default b/config/application.yml.default index 4aed18a73..fbbab825d 100644 --- a/config/application.yml.default +++ b/config/application.yml.default @@ -58,7 +58,7 @@ OPENLAB_BASE_URI: 'https://openprojects.fab-manager.com' LOG_LEVEL: 'debug' ALLOWED_EXTENSIONS: pdf ai eps cad math svg stl dxf dwg obj step iges igs 3dm 3dmf doc docx png ino scad fcad skp sldprt sldasm slddrw slddrt tex latex ps -ALLOWED_MIME_TYPES: application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/ application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex +ALLOWED_MIME_TYPES: application/pdf application/postscript application/illustrator image/x-eps image/svg+xml application/sla application/dxf application/acad application/dwg application/octet-stream application/step application/iges model/iges x-world/x-3dmf application/vnd.openxmlformats-officedocument.wordprocessingml.document image/png text/x-arduino text/plain application/scad application/vnd.sketchup.skp application/x-koan application/vnd-koan koan/x-skm application/vnd.koan application/x-tex application/x-latex # 10485760 = 10 megabytes MAX_IMAGE_SIZE: '10485760' From 906bb5b26ef3e6e8c45935ca7006e94529c962a8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Jan 2017 11:27:58 +0100 Subject: [PATCH 159/289] add upgrade instructions --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3b767a4a..ecff63702 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Fix a bug: display more than 15 unread notifications (number on the bell icon & full list) - Fix a bug: in invoice configuration panel, VAT amount and total excl. taxes are inverted - Fix a bug: unable to compute user's age when they were born on february 29th and current year is not a leap year +- [TODO DEPLOY] remove possible value `application/` in `ALLOWED_MIME_TYPES` list, in environment variable ## v2.4.8 2016 December 15 From 5b7e8474d49bbc7772121d3775bfdf7073551581 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Jan 2017 12:07:16 +0100 Subject: [PATCH 160/289] asterisk on group select in member form --- CHANGELOG.md | 1 + app/assets/templates/admin/members/_form.html.erb | 5 ++++- app/models/availability.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecff63702..1a2700dbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## next release - Mask new notifications alerts when more than 3 +- Added an asterisk on group select in admin's member form - Fix a bug: display more than 15 unread notifications (number on the bell icon & full list) - Fix a bug: in invoice configuration panel, VAT amount and total excl. taxes are inverted - Fix a bug: unable to compute user's age when they were born on february 29th and current year is not a leap year diff --git a/app/assets/templates/admin/members/_form.html.erb b/app/assets/templates/admin/members/_form.html.erb index d7c1831d0..243051576 100644 --- a/app/assets/templates/admin/members/_form.html.erb +++ b/app/assets/templates/admin/members/_form.html.erb @@ -1,5 +1,8 @@
- +
diff --git a/app/models/availability.rb b/app/models/availability.rb index 7e7dd4f4e..8e9dd393e 100644 --- a/app/models/availability.rb +++ b/app/models/availability.rb @@ -96,7 +96,7 @@ class Availability < ActiveRecord::Base def as_indexed_json json = JSON.parse(to_json) - json['hours_duration'] = (end_at - start_at) / (60*60) + json['hours_duration'] = (end_at - start_at) / (60 * 60) json.to_json end From 9edf723373b2810226811c8c4e10d8a8509e2075 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Jan 2017 13:35:36 +0100 Subject: [PATCH 161/289] [bug] wrong statistics about hours available for reservation --- CHANGELOG.md | 2 ++ app/models/availability.rb | 2 ++ db/seeds.rb | 2 +- test/fixtures/statistic_custom_aggregations.yml | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a2700dbd..44759d180 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ - Fix a bug: display more than 15 unread notifications (number on the bell icon & full list) - Fix a bug: in invoice configuration panel, VAT amount and total excl. taxes are inverted - Fix a bug: unable to compute user's age when they were born on february 29th and current year is not a leap year +- Fix a bug: wrong statistics about hours available for reservation. Fix requires user action (1) - [TODO DEPLOY] remove possible value `application/` in `ALLOWED_MIME_TYPES` list, in environment variable +- [TODO DEPLOY] `rails runner StatisticCustomAggregation.destroy_all`, then `rake db:seed`, then `rake fablab:es_build_availabilities_index` (1) ## v2.4.8 2016 December 15 diff --git a/app/models/availability.rb b/app/models/availability.rb index 8e9dd393e..a232dddc3 100644 --- a/app/models/availability.rb +++ b/app/models/availability.rb @@ -97,6 +97,8 @@ class Availability < ActiveRecord::Base def as_indexed_json json = JSON.parse(to_json) json['hours_duration'] = (end_at - start_at) / (60 * 60) + json['machines'] = machines_availabilities.map{|ma| ma.machine.friendly_id} + json['bookable_hours'] = json['hours_duration'] * json['machines'].length json.to_json end diff --git a/db/seeds.rb b/db/seeds.rb index c10636074..887ab461f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -407,7 +407,7 @@ if StatisticCustomAggregation.count == 0 es_index: 'fablab', es_type: 'availabilities', field: 'available_hours', - query: '{"size":0, "aggregations":{"%{aggs_name}":{"sum":{"field":"hours_duration"}}}, "query":{"bool":{"must":[{"range":{"start_at":{"gte":"%{start_date}", "lte":"%{end_date}"}}}, {"match":{"available_type":"machines"}}]}}}' + query: '{"size":0, "aggregations":{"%{aggs_name}":{"sum":{"field":"bookable_hours"}}}, "query":{"bool":{"must":[{"range":{"start_at":{"gte":"%{start_date}", "lte":"%{end_date}"}}}, {"match":{"available_type":"machines"}}]}}}' }) available_hours.save! diff --git a/test/fixtures/statistic_custom_aggregations.yml b/test/fixtures/statistic_custom_aggregations.yml index 35c1e14fd..146b437fe 100644 --- a/test/fixtures/statistic_custom_aggregations.yml +++ b/test/fixtures/statistic_custom_aggregations.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - query: '{"size":0, "aggregations":{"%{aggs_name}":{"sum":{"field":"hours_duration"}}}, "query":{"bool":{"must":[{"range":{"start_at":{"gte":"%{start_date}", "lte":"%{end_date}"}}}, {"match":{"available_type":"machines"}}]}}}' + query: '{"size":0, "aggregations":{"%{aggs_name}":{"sum":{"field":"bookable_hours"}}}, "query":{"bool":{"must":[{"range":{"start_at":{"gte":"%{start_date}", "lte":"%{end_date}"}}}, {"match":{"available_type":"machines"}}]}}}' statistic_type_id: 2 field: "available_hours" es_index: "fablab" From 8119f54e4ce4fbed21152a2ed842115d029c792f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 Jan 2017 17:07:23 +0100 Subject: [PATCH 162/289] Statistics about hours available for machine reservations and tickets available for training reservations, now handle custom filtering on date and type --- CHANGELOG.md | 4 +- .../controllers/admin/graphs.coffee | 1 + .../controllers/admin/statistics.coffee.erb | 32 +++++++++---- app/controllers/api/statistics_controller.rb | 11 +---- app/models/availability.rb | 12 ++++- app/services/custom_aggregation_service.rb | 45 +++++++++++++++++++ 6 files changed, 84 insertions(+), 21 deletions(-) create mode 100644 app/services/custom_aggregation_service.rb diff --git a/CHANGELOG.md b/CHANGELOG.md index 44759d180..702ebf791 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,12 @@ ## next release - Mask new notifications alerts when more than 3 - Added an asterisk on group select in admin's member form +- Statistics custom aggregations can handle custom filtering +- Statistics about hours available for machine reservations and tickets available for training reservations, now handle custom filtering on date and type - Fix a bug: display more than 15 unread notifications (number on the bell icon & full list) - Fix a bug: in invoice configuration panel, VAT amount and total excl. taxes are inverted - Fix a bug: unable to compute user's age when they were born on february 29th and current year is not a leap year -- Fix a bug: wrong statistics about hours available for reservation. Fix requires user action (1) +- Fix a bug: wrong statistics about hours available for machines reservation. Fix requires user action (1) - [TODO DEPLOY] remove possible value `application/` in `ALLOWED_MIME_TYPES` list, in environment variable - [TODO DEPLOY] `rails runner StatisticCustomAggregation.destroy_all`, then `rake db:seed`, then `rake fablab:es_build_availabilities_index` (1) diff --git a/app/assets/javascripts/controllers/admin/graphs.coffee b/app/assets/javascripts/controllers/admin/graphs.coffee index 8c23e69c7..6100e20e8 100644 --- a/app/assets/javascripts/controllers/admin/graphs.coffee +++ b/app/assets/javascripts/controllers/admin/graphs.coffee @@ -363,6 +363,7 @@ Application.Controllers.controller "GraphsController", ["$scope", "$state", "$ro "type": esType "searchType": "count" "stat-type": statType + "custom-query": '' "start-date": moment($scope.datePickerStart.selected).format() "end-date": moment($scope.datePickerEnd.selected).format() "body": buildElasticAggregationsQuery(statType, $scope.display.interval, moment($scope.datePickerStart.selected), moment($scope.datePickerEnd.selected)) diff --git a/app/assets/javascripts/controllers/admin/statistics.coffee.erb b/app/assets/javascripts/controllers/admin/statistics.coffee.erb index 53d289217..b99297b21 100644 --- a/app/assets/javascripts/controllers/admin/statistics.coffee.erb +++ b/app/assets/javascripts/controllers/admin/statistics.coffee.erb @@ -380,6 +380,7 @@ Application.Controllers.controller "StatisticsController", ["$scope", "$state", "size": RESULTS_PER_PAGE "scroll": ES_SCROLL_TIME+'m' "stat-type": type + "custom-query": if custom then JSON.stringify(Object.assign({exclude: custom.exclude}, buildElasticCustomCriterion(custom))) else '' "start-date": moment($scope.datePickerStart.selected).format() "end-date": moment($scope.datePickerEnd.selected).format() "body": buildElasticDataQuery(type, custom, $scope.agePicker.start, $scope.agePicker.end, moment($scope.datePickerStart.selected), moment($scope.datePickerEnd.selected), $scope.sorting) @@ -427,15 +428,7 @@ Application.Controllers.controller "StatisticsController", ["$scope", "$state", "lte": ageMax # optional criterion if custom - criterion = { - "match" : {} - } - switch $scope.getCustomValueInputType($scope.customFilter.criterion) - when 'input_date' then criterion.match[custom.key] = moment(custom.value).format('YYYY-MM-DD') - when 'input_select' then criterion.match[custom.key] = custom.value.key - when 'input_list' then criterion.match[custom.key+".name"] = custom.value - else criterion.match[custom.key] = custom.value - + criterion = buildElasticCustomCriterion(custom) if (custom.exclude) q = "query": { "filtered": { @@ -470,6 +463,27 @@ Application.Controllers.controller "StatisticsController", ["$scope", "$state", + ## + # Build the elasticSearch query DSL to match the selected cutom filter + # @param custom {Object} if custom is empty or undefined, an empty string will be returned + # @returns {{match:{*}}|string} + ## + buildElasticCustomCriterion = (custom) -> + if (custom) + criterion = { + "match" : {} + } + switch $scope.getCustomValueInputType($scope.customFilter.criterion) + when 'input_date' then criterion.match[custom.key] = moment(custom.value).format('YYYY-MM-DD') + when 'input_select' then criterion.match[custom.key] = custom.value.key + when 'input_list' then criterion.match[custom.key+".name"] = custom.value + else criterion.match[custom.key] = custom.value + criterion + else + '' + + + ## # Parse the provided criteria array and return the corresponding elasticSearch syntax # @param criteria {Array} array of {key_to_sort:order} diff --git a/app/controllers/api/statistics_controller.rb b/app/controllers/api/statistics_controller.rb index 356ab07ae..e82603202 100644 --- a/app/controllers/api/statistics_controller.rb +++ b/app/controllers/api/statistics_controller.rb @@ -13,6 +13,7 @@ class API::StatisticsController < API::ApiController # remove additional parameters statistic_type = request.query_parameters.delete('stat-type') + custom_query = request.query_parameters.delete('custom-query') start_date = request.query_parameters.delete('start-date') end_date = request.query_parameters.delete('end-date') @@ -21,15 +22,7 @@ class API::StatisticsController < API::ApiController results = Stats::#{path.classify}.search(query, request.query_parameters.symbolize_keys).response # run additional custom aggregations, if any - if statistic_type and start_date and end_date - stat_index = StatisticIndex.find_by(es_type_key: "#{path}") - stat_type = StatisticType.where(statistic_index_id: stat_index.id, key: statistic_type).first - client = Elasticsearch::Model.client - stat_type.statistic_custom_aggregations.each do |custom| - c_res = client.search index: custom.es_index, type:custom.es_type, body:sprintf(custom.query, {aggs_name: custom.field, start_date: start_date, end_date: end_date}) - results['aggregations'][custom.field] = c_res['aggregations'][custom.field] - end - end + CustomAggregationService.new.("#{path}", statistic_type, start_date, end_date, custom_query, results) # return result render json: results diff --git a/app/models/availability.rb b/app/models/availability.rb index a232dddc3..2b8b29c90 100644 --- a/app/models/availability.rb +++ b/app/models/availability.rb @@ -38,6 +38,7 @@ class Availability < ActiveRecord::Base settings do mappings dynamic: 'true' do indexes 'available_type', analyzer: 'simple' + indexes 'subType', index: 'not_analyzed' end end @@ -97,8 +98,15 @@ class Availability < ActiveRecord::Base def as_indexed_json json = JSON.parse(to_json) json['hours_duration'] = (end_at - start_at) / (60 * 60) - json['machines'] = machines_availabilities.map{|ma| ma.machine.friendly_id} - json['bookable_hours'] = json['hours_duration'] * json['machines'].length + if available_type == 'machines' + json['subType'] = machines_availabilities.map{|ma| ma.machine.friendly_id} + elsif available_type == 'training' + json['subType'] = trainings_availabilities.map{|ta| ta.training.friendly_id} + elsif available_type == 'event' + json['subType'] = [event.category.friendly_id] + end + json['bookable_hours'] = json['hours_duration'] * json['subType'].length + json['date'] = start_at.to_date json.to_json end diff --git a/app/services/custom_aggregation_service.rb b/app/services/custom_aggregation_service.rb new file mode 100644 index 000000000..034e237b8 --- /dev/null +++ b/app/services/custom_aggregation_service.rb @@ -0,0 +1,45 @@ +require 'json' + +class CustomAggregationService + + ## + # Run any additional custom aggregations related to the given statistic type, if any + ## + def call(statistic_index, statistic_type, start_date, end_date, custom_query, results) + if statistic_type and start_date and end_date + stat_index = StatisticIndex.find_by(es_type_key: statistic_index) + stat_type = StatisticType.find_by(statistic_index_id: stat_index.id, key: statistic_type) + client = Elasticsearch::Model.client + stat_type.statistic_custom_aggregations.each do |custom| + + query = sprintf(custom.query, {aggs_name: custom.field, start_date: start_date, end_date: end_date}) + + if custom_query and !custom_query.empty? + # Here, a custom query was provided with the original request (eg: filter by subtype) + # so we try to apply this custom filter to the current custom aggregation. + # + # The requested model mapping (ie. found in StatisticCustomAggregation.es_index > es_type) must have defined + # these fields in the indexed json, otherwise the returned value will probably not be what is expected. + # + # As an implementation exemple, you can take a look at Availability (indexed as fablab/availabilities) + # and witch will run custom filters on the fields 'date' and 'subType'. Other custom filters will return 0 + # as they are not relevant with this kind of custom aggregation. + query = JSON.parse(query) + custom_query = JSON.parse(custom_query) + + exclude = custom_query.delete('exclude') + if exclude + query = {query: { filtered: { query: query['query'], filter: { not: { term: custom_query['match'] } } } }, aggregations: query['aggregations'], size: query['size']} + else + query['query']['bool']['must'].push(custom_query) + end + query = query.to_json + end + + c_res = client.search(index: custom.es_index, type: custom.es_type, body: query) + results['aggregations'][custom.field] = c_res['aggregations'][custom.field] + end + end + results + end +end \ No newline at end of file From e656b7d7842ae7759e88850e68042111468797d6 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 4 Jan 2017 14:46:43 +0100 Subject: [PATCH 163/289] [bug] regenerate statistics does not remove all previous values --- CHANGELOG.md | 1 + app/services/statistic_service.rb | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 702ebf791..d095160c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Fix a bug: in invoice configuration panel, VAT amount and total excl. taxes are inverted - Fix a bug: unable to compute user's age when they were born on february 29th and current year is not a leap year - Fix a bug: wrong statistics about hours available for machines reservation. Fix requires user action (1) +- Fix a bug: when regenerating statistics, previous values are not fully removed (only 10 firsts), resulting in wrong statistics generation - [TODO DEPLOY] remove possible value `application/` in `ALLOWED_MIME_TYPES` list, in environment variable - [TODO DEPLOY] `rails runner StatisticCustomAggregation.destroy_all`, then `rake db:seed`, then `rake fablab:es_build_availabilities_index` (1) diff --git a/app/services/statistic_service.rb b/app/services/statistic_service.rb index b824e370e..f19736ee6 100644 --- a/app/services/statistic_service.rb +++ b/app/services/statistic_service.rb @@ -297,8 +297,10 @@ class StatisticService end def clean_stat(options = default_options) + client = Elasticsearch::Model.client %w{Account Event Machine Project Subscription Training User}.each do |o| - "Stats::#{o}".constantize.search(query: {match: {date: format_date(options[:start_date])}}).results.each(&:destroy) + model = "Stats::#{o}".constantize + client.delete_by_query(index: model.index_name, type: model.document_type, body: {query: {match: {date: format_date(options[:start_date])}}}) end end From ce7b737163e7b7b998794a599f3c57eae96dbd44 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 4 Jan 2017 14:48:32 +0100 Subject: [PATCH 164/289] possible workaround for orphan InvoiceWorkers created with nil parameter Moreover, a log was added on job creation, to help debugging if this does not fix the issue --- app/models/invoice.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/invoice.rb b/app/models/invoice.rb index 3facee497..2d699c466 100644 --- a/app/models/invoice.rb +++ b/app/models/invoice.rb @@ -13,7 +13,7 @@ class Invoice < ActiveRecord::Base has_one :avoir, class_name: 'Invoice', foreign_key: :invoice_id, dependent: :destroy after_create :update_reference - after_commit :generate_and_send_invoice, on: [:create] + after_commit :generate_and_send_invoice, on: [:create], :if => :persisted? def file dir = "invoices/#{user.id}" @@ -204,6 +204,7 @@ class Invoice < ActiveRecord::Base private def generate_and_send_invoice + puts "Creating an InvoiceWorker job to generate the following invoice: id(#{id}), invoiced_id(#{invoiced_id}), invoiced_type(#{invoiced_type}), user_id(#{user_id})" InvoiceWorker.perform_async(id) end From b5246ae1cfc8a66d644dd54a65e17b4bde005174 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 4 Jan 2017 15:20:54 +0100 Subject: [PATCH 165/289] [bug] AvailabilityIndexerWorker crash availabilities deleted just after their creation --- CHANGELOG.md | 1 + app/workers/availability_indexer_worker.rb | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d095160c5..3950ee773 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Fix a bug: unable to compute user's age when they were born on february 29th and current year is not a leap year - Fix a bug: wrong statistics about hours available for machines reservation. Fix requires user action (1) - Fix a bug: when regenerating statistics, previous values are not fully removed (only 10 firsts), resulting in wrong statistics generation +- Fix a bug: when deleting an availability just after its creation, the indexer workers crash and retries for a month - [TODO DEPLOY] remove possible value `application/` in `ALLOWED_MIME_TYPES` list, in environment variable - [TODO DEPLOY] `rails runner StatisticCustomAggregation.destroy_all`, then `rake db:seed`, then `rake fablab:es_build_availabilities_index` (1) diff --git a/app/workers/availability_indexer_worker.rb b/app/workers/availability_indexer_worker.rb index a902ed718..c26acadad 100644 --- a/app/workers/availability_indexer_worker.rb +++ b/app/workers/availability_indexer_worker.rb @@ -10,11 +10,18 @@ class AvailabilityIndexerWorker case operation.to_s when /index/ - record = Availability.find(record_id) - Client.index index: Availability.index_name, type: Availability.document_type, id: record.id, body: record.as_indexed_json - #puts record.as_indexed_json + begin + record = Availability.find(record_id) + Client.index index: Availability.index_name, type: Availability.document_type, id: record.id, body: record.as_indexed_json + rescue ActiveRecord::RecordNotFound + STDERR.puts "Availability id(#{record_id}) will not be indexed in ElasticSearch as it does not exists anymore in database" + end when /delete/ - Client.delete index: Availability.index_name, type: Availability.document_type, id: record_id + begin + Client.delete index: Availability.index_name, type: Availability.document_type, id: record_id + rescue Elasticsearch::Transport::Transport::Errors::NotFound + STDERR.puts "Availability id(#{record_id}) will not be deleted form ElasticSearch as it has not been already indexed" + end else raise ArgumentError, "Unknown operation '#{operation}'" end end From 7f98cdb76d3d6c50142de9039dbfad1eb7655690 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 4 Jan 2017 15:30:21 +0100 Subject: [PATCH 166/289] Version 2.4.9 --- .fabmanager-version | 2 +- CHANGELOG.md | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.fabmanager-version b/.fabmanager-version index 752a79ef3..158349812 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.4.8 \ No newline at end of file +2.4.9 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 3950ee773..f8cbe8c54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog Fab Manager -## next release +## v2.4.9 2017 January 4 + - Mask new notifications alerts when more than 3 - Added an asterisk on group select in admin's member form - Statistics custom aggregations can handle custom filtering @@ -9,10 +10,11 @@ - Fix a bug: in invoice configuration panel, VAT amount and total excl. taxes are inverted - Fix a bug: unable to compute user's age when they were born on february 29th and current year is not a leap year - Fix a bug: wrong statistics about hours available for machines reservation. Fix requires user action (1) -- Fix a bug: when regenerating statistics, previous values are not fully removed (only 10 firsts), resulting in wrong statistics generation +- Fix a bug: when regenerating statistics, previous values are not fully removed (only 10 firsts), resulting in wrong statistics generation (2) - Fix a bug: when deleting an availability just after its creation, the indexer workers crash and retries for a month - [TODO DEPLOY] remove possible value `application/` in `ALLOWED_MIME_TYPES` list, in environment variable - [TODO DEPLOY] `rails runner StatisticCustomAggregation.destroy_all`, then `rake db:seed`, then `rake fablab:es_build_availabilities_index` (1) +- [TODO DEPLOY] `fablab:generate_stats[1095]` if you already has regenerated the statistics in the past, then they are very likely corrupted. Run this task to fix (2) ## v2.4.8 2016 December 15 From c479502dd0ff63fbc000c0bff6ea97c6f9baedaf Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 5 Jan 2017 15:06:54 +0100 Subject: [PATCH 167/289] [bug] too many unread notifications cause system memory overflow --- CHANGELOG.md | 5 ++ .../controllers/application.coffee.erb | 47 ++++++++-------- .../javascripts/controllers/members.coffee | 4 +- .../controllers/notifications.coffee | 55 ++++++++++++++----- .../controllers/profile.coffee.erb | 4 +- .../javascripts/services/notification.coffee | 8 +++ .../templates/notifications/index.html.erb | 52 +++++++++--------- app/assets/templates/shared/header.html.erb | 2 +- .../api/notifications_controller.rb | 51 ++++++++++++++--- .../api/notifications/index.json.jbuilder | 19 +++---- config/locales/app.public.en.yml | 2 +- config/locales/app.public.fr.yml | 2 +- config/locales/fr.yml | 2 +- config/routes.rb | 2 + 14 files changed, 167 insertions(+), 88 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8cbe8c54..ae5f1f8f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog Fab Manager +## v2.4.10 2017 January 5 + +- Optimized notifications system +- Fix a bug: when many users with too many unread notifications are connected at the same time, the system kill the application due to memory overflow + ## v2.4.9 2017 January 4 - Mask new notifications alerts when more than 3 diff --git a/app/assets/javascripts/controllers/application.coffee.erb b/app/assets/javascripts/controllers/application.coffee.erb index 645b6e6cb..683c2e3ff 100644 --- a/app/assets/javascripts/controllers/application.coffee.erb +++ b/app/assets/javascripts/controllers/application.coffee.erb @@ -60,7 +60,9 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco Session.destroy() $rootScope.currentUser = null $rootScope.toCheckNotifications = false - $scope.notifications = [] + $scope.notifications = + total: 0 + unread: 0 $state.go('app.public.home') , (error) -> # An error occurred logging out. @@ -261,33 +263,30 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco $rootScope.toCheckNotifications = true unless $rootScope.checkNotificationsIsInit or !$rootScope.currentUser setTimeout -> - $scope.notifications = Notification.query {is_read: false} + # we request the most recent notifications + Notification.last_unread (notifications) -> + $rootScope.lastCheck = new Date() + $scope.notifications = notifications.totals + + toDisplay = [] + angular.forEach notifications.notifications, (n) -> + toDisplay.push(n) + + if toDisplay.length < notifications.totals.unread + toDisplay.push({message: {description: _t('and_NUMBER_other_notifications', {NUMBER: notifications.totals.unread - toDisplay.length}, "messageformat")}}) + + angular.forEach toDisplay, (notification) -> + growl.info(notification.message.description) , 2000 - $scope.$watch 'notifications', (newValue, oldValue) -> - diff = [] - angular.forEach newValue, (value) -> - find = false - for i in [0..oldValue.length] by 1 - if oldValue[i] and (value.id is oldValue[i].id) - find = true - break - - unless find - diff.push(value) - - remain = 3 - if diff.length >= remain - diff.splice(remain, (diff.length - remain), {message: {description: _t('and_NUMBER_other_notifications', {NUMBER: diff.length - remain})}}) - - angular.forEach diff, (notification, key) -> - growl.info(notification.message.description) - - , true checkNotifications = -> if $rootScope.toCheckNotifications - Notification.query({is_read: false}).$promise.then (data) -> - $scope.notifications = data; + Notification.polling({last_poll: $rootScope.lastCheck}).$promise.then (data) -> + $rootScope.lastCheck = new Date() + $scope.notifications = data.totals + + angular.forEach data.notifications, (notification) -> + growl.info(notification.message.description) $interval(checkNotifications, NOTIFICATIONS_CHECK_PERIOD) $rootScope.checkNotificationsIsInit = true diff --git a/app/assets/javascripts/controllers/members.coffee b/app/assets/javascripts/controllers/members.coffee index f71b8292c..3c2c96e56 100644 --- a/app/assets/javascripts/controllers/members.coffee +++ b/app/assets/javascripts/controllers/members.coffee @@ -225,7 +225,9 @@ Application.Controllers.controller "EditProfileController", ["$scope", "$rootSco Session.destroy() $rootScope.currentUser = null $rootScope.toCheckNotifications = false - $scope.notifications = [] + $scope.notifications = + total: 0 + unread: 0 $window.location.href = $scope.activeProvider.link_to_sso_connect diff --git a/app/assets/javascripts/controllers/notifications.coffee b/app/assets/javascripts/controllers/notifications.coffee index 3426aa1d0..9c2e3ade2 100644 --- a/app/assets/javascripts/controllers/notifications.coffee +++ b/app/assets/javascripts/controllers/notifications.coffee @@ -2,7 +2,7 @@ ## # Controller used in notifications page -# inherits $scope.$parent.notifications (unread notifications) from ApplicationController +# inherits $scope.$parent.notifications (global notifications state) from ApplicationController ## Application.Controllers.controller "NotificationsController", ["$scope", 'Notification', ($scope, Notification) -> @@ -20,6 +20,15 @@ Application.Controllers.controller "NotificationsController", ["$scope", 'Notifi ## Array containg the archived notifications (already read) $scope.notificationsRead = [] + ## Array containg the new notifications (not read) + $scope.notificationsUnread = [] + + ## Total number of notifications for the current user + $scope.total = 0 + + ## Total number of unread notifications for the current user + $scope.totalUnread = 0 + ## By default, the pagination mode is activated to limit the page size $scope.paginateActive = true @@ -39,10 +48,15 @@ Application.Controllers.controller "NotificationsController", ["$scope", 'Notifi Notification.update {id: notification.id}, id: notification.id is_read: true - , -> - index = $scope.$parent.notifications.indexOf(notification) - $scope.$parent.notifications.splice(index,1) - $scope.notificationsRead.push notification + , (updatedNotif) -> + # remove notif from unreads + index = $scope.notificationsUnread.indexOf(notification) + $scope.notificationsUnread.splice(index,1) + # add update notif to read + $scope.notificationsRead.push updatedNotif + # update counters + $scope.$parent.notifications.unread -= 1 + $scope.totalUnread -= 1 @@ -52,21 +66,32 @@ Application.Controllers.controller "NotificationsController", ["$scope", 'Notifi $scope.markAllAsRead = -> Notification.update {} , -> # success - angular.forEach $scope.$parent.notifications, (n)-> + # add notifs to read + angular.forEach $scope.notificationsUnread, (n)-> + n.is_read = true $scope.notificationsRead.push n - - $scope.$parent.notifications.splice(0, $scope.$parent.notifications.length) + # clear unread + $scope.notificationsUnread = [] + # update counters + $scope.$parent.notifications.unread = 0 + $scope.totalUnread = 0 ## - # Request the server to retrieve the next undisplayed notifications and add them - # to the archived notifications list. + # Request the server to retrieve the next notifications and add them + # to their corresponding notifications list (read or unread). ## - $scope.addMoreNotificationsReaded = -> - Notification.query {is_read: true, page: $scope.page}, (notifications) -> - $scope.notificationsRead = $scope.notificationsRead.concat notifications - $scope.paginateActive = false if notifications.length < NOTIFICATIONS_PER_PAGE + $scope.addMoreNotifications = -> + Notification.query {page: $scope.page}, (notifications) -> + $scope.total = notifications.totals.total + $scope.totalUnread = notifications.totals.unread + angular.forEach notifications.notifications, (notif) -> + if notif.is_read + $scope.notificationsRead.push(notif) + else + $scope.notificationsUnread.push(notif) + $scope.paginateActive = (notifications.totals.total > ($scope.notificationsRead.length + $scope.notificationsUnread.length)) $scope.page += 1 @@ -78,7 +103,7 @@ Application.Controllers.controller "NotificationsController", ["$scope", 'Notifi # Kind of constructor: these actions will be realized first when the controller is loaded ## initialize = -> - $scope.addMoreNotificationsReaded() + $scope.addMoreNotifications() diff --git a/app/assets/javascripts/controllers/profile.coffee.erb b/app/assets/javascripts/controllers/profile.coffee.erb index 781f12995..c5ca54280 100644 --- a/app/assets/javascripts/controllers/profile.coffee.erb +++ b/app/assets/javascripts/controllers/profile.coffee.erb @@ -170,7 +170,9 @@ Application.Controllers.controller "CompleteProfileController", ["$scope", "$roo Session.destroy() $rootScope.currentUser = null $rootScope.toCheckNotifications = false - $scope.notifications = [] + $scope.notifications = + total: 0 + unread: 0 $window.location.href = activeProviderPromise.link_to_sso_connect diff --git a/app/assets/javascripts/services/notification.coffee b/app/assets/javascripts/services/notification.coffee index 56709c43c..42eb9e9e2 100644 --- a/app/assets/javascripts/services/notification.coffee +++ b/app/assets/javascripts/services/notification.coffee @@ -3,6 +3,14 @@ Application.Services.factory 'Notification', ["$resource", ($resource)-> $resource "/api/notifications/:id", {id: "@id"}, + query: + isArray: false update: method: 'PUT' + polling: + url: '/api/notifications/polling' + method: 'GET' + last_unread: + url: '/api/notifications/last_unread' + method: 'GET' ] diff --git a/app/assets/templates/notifications/index.html.erb b/app/assets/templates/notifications/index.html.erb index e4d3f0003..1d244d4cd 100644 --- a/app/assets/templates/notifications/index.html.erb +++ b/app/assets/templates/notifications/index.html.erb @@ -19,7 +19,7 @@
- + @@ -31,7 +31,7 @@ - + - +
{{ 'no_new_notifications' }}
-
{{ 'archives' }}
+
+
{{ 'archives' }}
- - - - - - +
+ + + + + - - - + + + - - - - + + + + - + - - - + + + - -
- {{ n.created_at | amDateFormat:'LLL' }}
+ {{ n.created_at | amDateFormat:'LLL' }}
{{ 'no_archived_notifications' }}
{{ 'no_archived_notifications' }}
+ + +
- {{ 'load_the_next_notifications' }} + {{ 'load_the_next_notifications' }}
diff --git a/app/assets/templates/shared/header.html.erb b/app/assets/templates/shared/header.html.erb index ed5bfef09..3a2c59502 100644 --- a/app/assets/templates/shared/header.html.erb +++ b/app/assets/templates/shared/header.html.erb @@ -23,7 +23,7 @@
+ + +
+ +
+ + {{ 'space.default_places_is_required' }} +
+
+ + +
+ +
+ + + +
+
+ +
+ +
+ + + +
+
+ +
+ +
+
+ + + +
+
+ {{file.attachment}} +
+ {{ 'space.attach_a_file' }} + {{ 'change' }} + +
+ +
+ {{ 'space.add_an_attachment' | translate }} +
+
diff --git a/app/assets/templates/spaces/edit.html.erb b/app/assets/templates/spaces/edit.html.erb new file mode 100644 index 000000000..d3fb4872b --- /dev/null +++ b/app/assets/templates/spaces/edit.html.erb @@ -0,0 +1,50 @@ +
+
+ +
+
+

{{ 'space_edit.edit_the_space_NAME' }}

+
+ +
+ +
+ +
+ + +
+ +
+
+ + + +
+
+ +
+ +
+ +
+
+
+
+ +
+
diff --git a/app/assets/templates/spaces/new.html.erb b/app/assets/templates/spaces/new.html.erb index 6a6f9350e..b97a5347a 100644 --- a/app/assets/templates/spaces/new.html.erb +++ b/app/assets/templates/spaces/new.html.erb @@ -7,7 +7,7 @@
-

{{ 'add_a_new_space' }}

+

{{ 'space_new.add_a_new_space' }}

@@ -22,11 +22,35 @@
- +
+ + + +
+
+ +
+ +
+ +
+
+
+
diff --git a/app/assets/templates/spaces/show.html b/app/assets/templates/spaces/show.html index e958b6175..6cc32f7f4 100644 --- a/app/assets/templates/spaces/show.html +++ b/app/assets/templates/spaces/show.html @@ -17,7 +17,7 @@
{{ 'space_show.book_this_space' }} - {{ 'edit' | translate }} + {{ 'edit' | translate }}
@@ -28,7 +28,7 @@
-
+
{{space.name}} diff --git a/app/views/api/spaces/show.json.jbuilder b/app/views/api/spaces/show.json.jbuilder index 826220853..2e09707ad 100644 --- a/app/views/api/spaces/show.json.jbuilder +++ b/app/views/api/spaces/show.json.jbuilder @@ -1,4 +1,4 @@ -json.extract! @space, :id, :name, :description, :characteristics, :created_at, :updated_at +json.extract! @space, :id, :name, :description, :characteristics, :created_at, :updated_at, :slug, :default_places json.space_image @space.space_image.attachment.large.url if @space.space_image json.space_files_attributes @space.space_files do |f| json.id f.id diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 1266164c6..092663440 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -69,12 +69,6 @@ en: 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." - space_new: - # create a new space - add_a_new_space: "Add a new space" - watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "Watch out! When creating a new space, its prices are initialized at 0 for all subscriptions." - consider_changing_its_prices_before_creating_any_reservation_slot: "Consider changing its prices before creating any reservation slot." - events: # events tracking and management events_monitoring: "Events monitoring" @@ -581,3 +575,17 @@ en: client_successfully_updated: "Client successfully updated." client_successfully_deleted: "Client successfully deleted." access_successfully_revoked: "Access successfully revoked." + + space_new: + # create a new space + space_new: + add_a_new_space: "Add a new space" + watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "Watch out! When creating a new space, its prices are initialized at 0 for all subscriptions." + consider_changing_its_prices_before_creating_any_reservation_slot: "Consider changing its prices before creating any reservation slot." + add_this_space: "Add this space" + + space_edit: + # modify an exiting space + space_edit: + edit_the_space_NAME: "Edit the space: {{NAME}}" # angular interpolation + validate_the_changes: "Validate the changes" diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 650e16348..d9f34dc17 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -69,12 +69,6 @@ fr: 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." - space_new: - # créer un nouvel espace - add_a_new_space: "Ajouter un nouvel espace" - watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "Attention, lors de la création d'un espace, ses tarifs de réservation sont initialisés à zero pour tout les abonnements." - consider_changing_its_prices_before_creating_any_reservation_slot: "Pensez à modifier ces prix avant de créer des créneaux pour cet espace." - events: # gestion et suivi des évènements events_monitoring: "Suivi des évènements" @@ -581,3 +575,17 @@ fr: client_successfully_updated: "Les modifications ont été enregistrées." client_successfully_deleted: "Le compte client a bien été supprimé." access_successfully_revoked: "L'accès a bien été revoqué." + + space_new: + # créer un nouvel espace + space_new: + add_a_new_space: "Ajouter un nouvel espace" + watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "Attention, lors de la création d'un espace, ses tarifs de réservation sont initialisés à zero pour tout les abonnements." + consider_changing_its_prices_before_creating_any_reservation_slot: "Pensez à modifier ces prix avant de créer des créneaux pour cet espace." + add_this_space: "Ajouter cet espace" + + space_edit: + # modifier un espace existant + space_edit: + edit_the_space_NAME: "Modifier l'espace : {{NAME}}" # angular interpolation + validate_the_changes: "Valider les modifications" diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index d1d394249..b4562de4e 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -396,6 +396,5 @@ en: attached_files_(pdf): "Attached files (pdf)" attach_a_file: "Attach a file" add_an_attachment: "Add an attachment" - add_this_space: "Add this space" default_places: "Default maximum tickets" default_places_is_required: "Default maximum tickets is required." \ No newline at end of file diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 82a6a170f..28501ec43 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -396,6 +396,5 @@ fr: attached_files_(pdf): "Pièces jointes (pdf)" attach_a_file: "Joindre un fichier" add_an_attachment: "Ajouter une pièce jointe" - add_this_space: "Ajouter cet espace" default_places: "Maximum de places par défaut" default_places_is_required: "Le nombre de places maximum par défaut est requis." \ No newline at end of file From 334201e551a8612bc0a37d6f58fcc45f951d90bb Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 14 Feb 2017 14:58:16 +0100 Subject: [PATCH 184/289] refactor admin pricing translations mapping --- .../controllers/admin/pricing.coffee.erb | 48 ++++---- .../templates/admin/pricing/coupons.html.erb | 14 +-- .../templates/admin/pricing/credits.html.erb | 18 +-- .../templates/admin/pricing/index.html.erb | 12 +- .../admin/pricing/machine_hours.html.erb | 4 +- .../admin/pricing/sendCoupon.html.erb | 16 +-- .../admin/pricing/subscriptions.html.erb | 22 ++-- .../admin/pricing/trainings.html.erb | 2 +- config/locales/app.admin.en.yml | 116 ++++++++++-------- config/locales/app.admin.fr.yml | 116 ++++++++++-------- 10 files changed, 202 insertions(+), 166 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/pricing.coffee.erb b/app/assets/javascripts/controllers/admin/pricing.coffee.erb index 76bcf7cf6..8144075bd 100644 --- a/app/assets/javascripts/controllers/admin/pricing.coffee.erb +++ b/app/assets/javascripts/controllers/admin/pricing.coffee.erb @@ -56,7 +56,7 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", if data? TrainingsPricing.update({ id: trainingsPricing.id }, { trainings_pricing: { amount: data } }).$promise else - _t('please_specify_a_number') + _t('pricing.please_specify_a_number') ## # Retrieve a plan from its given identifier and returns it @@ -89,13 +89,13 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", ## $scope.showTrainings = (trainings) -> unless angular.isArray(trainings) and trainings.length > 0 - return _t('none') + return _t('pricing.none') selected = [] angular.forEach $scope.trainings, (t) -> if trainings.indexOf(t.id) >= 0 selected.push t.name - return if selected.length then selected.join(' | ') else _t('none') + return if selected.length then selected.join(' | ') else _t('pricing.none') @@ -110,7 +110,7 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", training_credit_nb: newdata.training_credits , angular.noop() # do nothing in case of success , (error) -> - growl.error(_t('an_error_occurred_while_saving_the_number_of_credits')) + growl.error(_t('pricing.an_error_occurred_while_saving_the_number_of_credits')) # save the associated trainings angular.forEach $scope.trainingCreditsGroups, (original, key) -> @@ -126,9 +126,9 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", $scope.trainingCredits.splice($scope.trainingCredits.indexOf(tc), 1) $scope.trainingCreditsGroups[planId].splice($scope.trainingCreditsGroups[planId].indexOf(tc.id), 1) , (error) -> - growl.error(_t('an_error_occurred_while_deleting_credit_with_the_TRAINING', {TRAINING:tc.creditable.name})) + growl.error(_t('pricing.an_error_occurred_while_deleting_credit_with_the_TRAINING', {TRAINING:tc.creditable.name})) else - growl.error(_t('an_error_occurred_unable_to_find_the_credit_to_revoke')) + growl.error(_t('pricing.an_error_occurred_unable_to_find_the_credit_to_revoke')) # iterate through the new credits to add angular.forEach newdata.training_ids, (newTrainingId) -> @@ -143,7 +143,7 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", $scope.trainingCreditsGroups[newTc.plan_id].push(newTc.creditable_id) , (error) -> # failed training = getTrainingFromId(newTrainingId) - growl.error(_t('an_error_occurred_while_creating_credit_with_the_TRAINING', {TRAINING: training.name})) + growl.error(_t('pricing.an_error_occurred_while_creating_credit_with_the_TRAINING', {TRAINING: training.name})) console.error(error) @@ -177,7 +177,7 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", # @param credit {Object} credit object, inherited from $resource ## $scope.showCreditableName = (credit) -> - selected = _t('not_set') + selected = _t('pricing.not_set') if credit and credit.creditable_id angular.forEach $scope.machines, (m)-> if m.id == credit.creditable_id @@ -195,21 +195,21 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", $scope.saveMachineCredit = (data, id) -> for mc in $scope.machineCredits if mc.plan_id == data.plan_id and mc.creditable_id == data.creditable_id and (id == null or mc.id != id) - growl.error(_t('error_a_credit_linking_this_machine_with_that_subscription_already_exists')) + growl.error(_t('pricing.error_a_credit_linking_this_machine_with_that_subscription_already_exists')) unless id $scope.machineCredits.pop() return false if id? Credit.update {id: id}, credit: data, -> - growl.success(_t('changes_have_been_successfully_saved')) + growl.success(_t('pricing.changes_have_been_successfully_saved')) else data.creditable_type = 'Machine' Credit.save credit: data , (resp) -> $scope.machineCredits[$scope.machineCredits.length-1].id = resp.id - growl.success(_t('credit_was_successfully_saved')) + growl.success(_t('pricing.credit_was_successfully_saved')) ## @@ -242,8 +242,8 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", ## $scope.getPlanType = (type) -> if type == 'PartnerPlan' - return _t('partner') - else return _t('standard') + return _t('pricing.partner') + else return _t('pricing.standard') ## # Change the plans ordering criterion to the one provided @@ -270,7 +270,7 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", if data? Price.update({ id: price.id }, { price: { amount: data } }).$promise else - _t('please_specify_a_number') + _t('pricing.please_specify_a_number') ## # Delete the specified subcription plan @@ -284,17 +284,17 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", dialogs.confirm resolve: object: -> - title: _t('confirmation_required') - msg: _t('do_you_really_want_to_delete_this_subscription_plan') + title: _t('pricing.confirmation_required') + msg: _t('pricing.do_you_really_want_to_delete_this_subscription_plan') , -> # the admin has confirmed, delete the plan Plan.delete {id: id}, (res) -> - growl.success(_t('subscription_plan_was_successfully_deleted')) + growl.success(_t('pricing.subscription_plan_was_successfully_deleted')) $scope.plans.splice(findItemIdxById(plans, id), 1) , (error) -> console.error('[EditPricingController::deletePlan] Error: '+error.statusText) if error.statusText - growl.error(_t('unable_to_delete_the_specified_subscription_an_error_occurred')) + growl.error(_t('pricing.unable_to_delete_the_specified_subscription_an_error_occurred')) @@ -324,8 +324,8 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", dialogs.confirm resolve: object: -> - title: _t('confirmation_required') - msg: _t('do_you_really_want_to_delete_this_coupon') + title: _t('pricing.confirmation_required') + msg: _t('pricing.do_you_really_want_to_delete_this_coupon') , -> # the admin has confirmed, delete the coupon Coupon.delete {id: id}, (res) -> @@ -335,9 +335,9 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", , (error) -> console.error('[EditPricingController::deleteCoupon] Error: '+error.statusText) if error.statusText if error.status == 422 - growl.error(_t('unable_to_delete_the_specified_coupon_already_in_use')) + growl.error(_t('pricing.unable_to_delete_the_specified_coupon_already_in_use')) else - growl.error(_t('unable_to_delete_the_specified_coupon_an_unexpected_error_occurred')) + growl.error(_t('pricing.unable_to_delete_the_specified_coupon_an_unexpected_error_occurred')) @@ -363,10 +363,10 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", ## Callback to validate sending of the coupon $scope.ok = -> Coupon.send {coupon_code: coupon.code, user_id: $scope.ctrl.member.id}, (res) -> - growl.success(_t('coupon_successfully_sent_to_USER', {USER: $scope.ctrl.member.name})) + growl.success(_t('pricing.coupon_successfully_sent_to_USER', {USER: $scope.ctrl.member.name})) $uibModalInstance.close({user_id: $scope.ctrl.member.id}) , (err) -> - growl.error(_t('an_error_occurred_unable_to_send_the_coupon')) + growl.error(_t('pricing.an_error_occurred_unable_to_send_the_coupon')) ## Callback to close the modal and cancel the sending process $scope.cancel = -> diff --git a/app/assets/templates/admin/pricing/coupons.html.erb b/app/assets/templates/admin/pricing/coupons.html.erb index a09a9d8f1..484c9d74b 100644 --- a/app/assets/templates/admin/pricing/coupons.html.erb +++ b/app/assets/templates/admin/pricing/coupons.html.erb @@ -1,13 +1,13 @@ -

{{ 'list_of_the_coupons' }}

+

{{ 'pricing.list_of_the_coupons' }}

- + - - - - + + + + @@ -19,7 +19,7 @@ {{coupon.amount_off}} {{currencySymbol}} - + +
{{ 'name' }}{{ 'discount' }}{{ 'nb_of_usages' }}{{ 'status' }}{{ 'pricing.name' }}{{ 'pricing.discount' }}{{ 'pricing.nb_of_usages' }}{{ 'pricing.status' }}
{{coupon.usages}}{{coupon.status}}{{'pricing.'+coupon.status}} diff --git a/app/assets/templates/admin/pricing/credits.html.erb b/app/assets/templates/admin/pricing/credits.html.erb index 0ba6ea08d..0534e5780 100644 --- a/app/assets/templates/admin/pricing/credits.html.erb +++ b/app/assets/templates/admin/pricing/credits.html.erb @@ -1,10 +1,10 @@ -

{{ 'trainings' }}

+

{{ 'pricing.trainings' }}

- - - + + + @@ -43,17 +43,17 @@
{{ 'subscription' }}{{ 'credits' }}{{ 'related_trainings' }}{{ 'pricing.subscription' }}{{ 'pricing.credits' }}{{ 'pricing.related_trainings' }}
-

{{ 'machines' }}

+

{{ 'pricing.machines' }}

- +
- - - + + + diff --git a/app/assets/templates/admin/pricing/index.html.erb b/app/assets/templates/admin/pricing/index.html.erb index df110a925..bad193f0f 100644 --- a/app/assets/templates/admin/pricing/index.html.erb +++ b/app/assets/templates/admin/pricing/index.html.erb @@ -7,7 +7,7 @@
-

{{ 'pricing_management' }}

+

{{ 'pricing.pricing_management' }}

@@ -21,23 +21,23 @@
- + - + - + - + - + diff --git a/app/assets/templates/admin/pricing/machine_hours.html.erb b/app/assets/templates/admin/pricing/machine_hours.html.erb index d846d9574..84ecb5e1c 100644 --- a/app/assets/templates/admin/pricing/machine_hours.html.erb +++ b/app/assets/templates/admin/pricing/machine_hours.html.erb @@ -1,10 +1,10 @@
- {{ 'these_prices_match_machine_hours_rates_' | translate }} {{ '_without_subscriptions' }}. + {{ 'pricing.these_prices_match_machine_hours_rates_' | translate }} {{ 'pricing._without_subscriptions' }}.
{{ 'machine' }}{{ 'hours' }}{{ 'related_subscriptions' }}{{ 'pricing.machine' }}{{ 'pricing.hours' }}{{ 'pricing.related_subscriptions' }}
- + diff --git a/app/assets/templates/admin/pricing/sendCoupon.html.erb b/app/assets/templates/admin/pricing/sendCoupon.html.erb index 9de3c5d37..fad186cd7 100644 --- a/app/assets/templates/admin/pricing/sendCoupon.html.erb +++ b/app/assets/templates/admin/pricing/sendCoupon.html.erb @@ -1,11 +1,11 @@
-

{{ 'send_a_coupon' }}

+

{{ 'pricing.send_a_coupon' }}

-

{{ 'coupon' }}

+

{{ 'pricing.coupon' }}

{{ 'machines' }}{{ 'pricing.machines' }} {{group.name}}
@@ -13,12 +13,12 @@ - - - - - - + + + + + +
{{'code'}} {{coupon.code}}
{{'discount'}} {{coupon.percent_off}} %{{coupon.amount_off}} {{currencySymbol}}
{{'validity_per_user'}} {{coupon.validity_per_user}}
{{'valid_until'}} {{coupon.valid_until | amDateFormat:'L'}}
{{'usages'}} {{coupon.usages}} / {{coupon.max_usages | maxCount}}
{{'enabled'}} {{coupon.active | booleanFormat}}
{{'pricing.code'}} {{coupon.code}}
{{'pricing.discount'}} {{coupon.percent_off}} %{{coupon.amount_off}} {{currencySymbol}}
{{'pricing.validity_per_user'}} {{'pricing.'+coupon.validity_per_user}}
{{'pricing.valid_until'}} {{coupon.valid_until | amDateFormat:'L'}}
{{'pricing.usages'}} {{coupon.usages}} / {{coupon.max_usages | maxCount}}
{{'pricing.enabled'}} {{coupon.active | booleanFormat}}
diff --git a/app/assets/templates/admin/pricing/subscriptions.html.erb b/app/assets/templates/admin/pricing/subscriptions.html.erb index 792934cb3..2dc721e8d 100644 --- a/app/assets/templates/admin/pricing/subscriptions.html.erb +++ b/app/assets/templates/admin/pricing/subscriptions.html.erb @@ -1,21 +1,21 @@ -

{{ 'list_of_the_subscription_plans' }}

+

{{ 'pricing.list_of_the_subscription_plans' }}

- {{ 'beware_the_subscriptions_are_disabled_on_this_application' | translate }} - {{ 'you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager' | translate }} -
{{ 'for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later' | translate }} + {{ 'pricing.beware_the_subscriptions_are_disabled_on_this_application' | translate }} + {{ 'pricing.you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager' | translate }} +
{{ 'pricing.for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later' | translate }}
- + - - - - - - + + + + + + diff --git a/app/assets/templates/admin/pricing/trainings.html.erb b/app/assets/templates/admin/pricing/trainings.html.erb index d93f42c8e..6c6c230fd 100644 --- a/app/assets/templates/admin/pricing/trainings.html.erb +++ b/app/assets/templates/admin/pricing/trainings.html.erb @@ -1,7 +1,7 @@
{{ 'type' | translate }} {{ 'name' | translate }} {{ 'duration' | translate }} {{ 'group' | translate }} {{ 'price' | translate }} {{ 'pricing.type' | translate }} {{ 'pricing.name' | translate }} {{ 'pricing.duration' | translate }} {{ 'pricing.group' | translate }} {{ 'pricing.price' | translate }}
- + diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 092663440..7f636cb89 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -132,55 +132,73 @@ en: pricing: # subscriptions, prices, credits and coupons management - pricing_management: "Pricing management" - list_of_the_subscription_plans: "List of the subscription plans" - beware_the_subscriptions_are_disabled_on_this_application: "Beware, the subscriptions are disabled on this application." - you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager: "You can create some but they won't be available until the project is redeployed by the server manager." - for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later: "For safety reasons, please don't create subscriptions if you don't intend to use them later." - add_a_new_subscription_plan: "Add a new subscription plan" - duration: "Duration" - prominence: "Prominence" - machine_hours: "Machine hours" - these_prices_match_machine_hours_rates_: "These prices match machine hours rates" - _without_subscriptions: "without subscriptions" - credits: "Credits" - related_trainings: "Related trainings" - add_a_machine_credit: "Add a machine credit" - machine: "Machine" - hours: "Hours" - related_subscriptions: "Related subscriptions" - please_specify_a_number: "Please specify a number." - none: "None" # grammar note: concordance with "training". - an_error_occurred_while_saving_the_number_of_credits: "An error occurred while saving the number of credits." - an_error_occurred_while_deleting_credit_with_the_TRAINING: "An error occurred while deleting credit with the {{TRAINING}}." # angular interpolation - an_error_occurred_unable_to_find_the_credit_to_revoke: "An error occurred : unable to find the credit to revoke." - an_error_occurred_while_creating_credit_with_the_TRAINING: "An error occurred while creating credit with the {{TRAINING}}." # angular interpolation - not_set: "Not set" - error_a_credit_linking_this_machine_with_that_subscription_already_exists: "Error : a credit linking this machine with that subscription already exists." - changes_have_been_successfully_saved: "Changes have been successfully saved." - credit_was_successfully_saved: "Credit was successfully saved." - do_you_really_want_to_delete_this_subscription_plan: "Do you really want to delete this subscription plan?" - subscription_plan_was_successfully_deleted: "Subscription plan was successfully deleted." - unable_to_delete_the_specified_subscription_an_error_occurred: "Unable to delete the specified subscription, an error occurred." - coupons: "Coupons" - list_of_the_coupons: "List of the coupons" - discount: "Discount" - nb_of_usages: "Number of usages" - status: "Status" - add_a_new_coupon: "Add a new coupon" - disabled: "Disabled" - expired: "Expired" - sold_out: "Sold out" - active: "Active" - do_you_really_want_to_delete_this_coupon: "Do you really want to delete this coupon?" - coupon_was_successfully_deleted: "Coupon was successfully deleted." - unable_to_delete_the_specified_coupon_already_in_use: "Unable to delete the specified coupon: it is already used with some invoices." - unable_to_delete_the_specified_coupon_an_unexpected_error_occurred: "Unable to delete the specified coupon: an unexpected error occurred." - send_a_coupon: "Send a coupon" - coupon: "Coupon" - usages: "Usages" - coupon_successfully_sent_to_USER: "Coupon successfully sent to {{USER}}" # angular interpolation - an_error_occurred_unable_to_send_the_coupon: "An unexpected error prevent from sending the coupon." + pricing: + pricing_management: "Pricing management" + subscriptions: "Subscriptions" + trainings: "Trainings" + list_of_the_subscription_plans: "List of the subscription plans" + beware_the_subscriptions_are_disabled_on_this_application: "Beware, the subscriptions are disabled on this application." + you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager: "You can create some but they won't be available until the project is redeployed by the server manager." + for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later: "For safety reasons, please don't create subscriptions if you don't intend to use them later." + add_a_new_subscription_plan: "Add a new subscription plan" + type: "Type" + partner: "Partner" + standard: "Standard" + name: "Name" + duration: "Duration" + group: "Group" + prominence: "Prominence" + price: "Price" + machine_hours: "Machine hours" + these_prices_match_machine_hours_rates_: "These prices match machine hours rates" + _without_subscriptions: "without subscriptions" + machines: "Machines" + credits: "Credits" + subscription: "Subscription" + related_trainings: "Related trainings" + add_a_machine_credit: "Add a machine credit" + machine: "Machine" + hours: "Hours" + related_subscriptions: "Related subscriptions" + please_specify_a_number: "Please specify a number." + none: "None" # grammar note: concordance with "training". + an_error_occurred_while_saving_the_number_of_credits: "An error occurred while saving the number of credits." + an_error_occurred_while_deleting_credit_with_the_TRAINING: "An error occurred while deleting credit with the {{TRAINING}}." # angular interpolation + an_error_occurred_unable_to_find_the_credit_to_revoke: "An error occurred : unable to find the credit to revoke." + an_error_occurred_while_creating_credit_with_the_TRAINING: "An error occurred while creating credit with the {{TRAINING}}." # angular interpolation + not_set: "Not set" + error_a_credit_linking_this_machine_with_that_subscription_already_exists: "Error : a credit linking this machine with that subscription already exists." + changes_have_been_successfully_saved: "Changes have been successfully saved." + credit_was_successfully_saved: "Credit was successfully saved." + do_you_really_want_to_delete_this_subscription_plan: "Do you really want to delete this subscription plan?" + subscription_plan_was_successfully_deleted: "Subscription plan was successfully deleted." + unable_to_delete_the_specified_subscription_an_error_occurred: "Unable to delete the specified subscription, an error occurred." + coupons: "Coupons" + list_of_the_coupons: "List of the coupons" + discount: "Discount" + nb_of_usages: "Number of usages" + status: "Status" + add_a_new_coupon: "Add a new coupon" + disabled: "Disabled" + expired: "Expired" + sold_out: "Sold out" + active: "Active" + confirmation_required: "Confirmation required" + do_you_really_want_to_delete_this_coupon: "Do you really want to delete this coupon?" + coupon_was_successfully_deleted: "Coupon was successfully deleted." + unable_to_delete_the_specified_coupon_already_in_use: "Unable to delete the specified coupon: it is already used with some invoices." + unable_to_delete_the_specified_coupon_an_unexpected_error_occurred: "Unable to delete the specified coupon: an unexpected error occurred." + send_a_coupon: "Send a coupon" + coupon: "Coupon" + usages: "Usages" + coupon_successfully_sent_to_USER: "Coupon successfully sent to {{USER}}" # angular interpolation + an_error_occurred_unable_to_send_the_coupon: "An unexpected error prevent from sending the coupon." + code: "Code" + enabled: "Enabled" + validity_per_user: "Validity per user" + once: "Just once" + forever: "Each use" + valid_until: "Valid until (included)" coupons_new: # ajouter un code promotionnel diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index d9f34dc17..bd572cd0e 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -132,55 +132,73 @@ fr: pricing: # gestion des abonnements, des tarifs, des crédits et des codes promo - pricing_management: "Gestion de la tarification" - list_of_the_subscription_plans: "Liste des formules d'abonnements" - beware_the_subscriptions_are_disabled_on_this_application: "Attention, les abonnements sont désactivés sur cette application." - you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager: "Vous pouvez tout de même en créer mais ils ne seront disponibles qu'après un redéploiement du projet par le responsable du serveur." - for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later: "Pour des raisons de sécurité, veuillez ne pas créer d'abonnements si vous ne comptez pas les utiliser par la suite." - add_a_new_subscription_plan: "Ajouter une nouvelle formule d'abonnement" - duration: "Durée" - prominence: "Importance" - machine_hours: "Heures machines" - these_prices_match_machine_hours_rates_: "Ces tarifs correspondent au prix d'une heure machine" - _without_subscriptions: "sans abonnement" - credits: "Crédits" - related_trainings: "Formations associées" - add_a_machine_credit: "Ajouter un crédit Machine" - machine: "Machine" - hours: "Heures" - related_subscriptions: "Abonnements associés" - please_specify_a_number: "Veuillez spécifier un nombre." - none: "Aucune" # grammar note: concordance with "training". - an_error_occurred_while_saving_the_number_of_credits: "Une erreur est survenue lors de l'enregistrement du nombre de crédits." - an_error_occurred_while_deleting_credit_with_the_TRAINING: "Une erreur est survenue lors de la suppression du crédit avec la {{TRAINING}}." # angular interpolation - an_error_occurred_unable_to_find_the_credit_to_revoke: "Une erreur est survenue : impossible de retrouver le crédit à enlever." - an_error_occurred_while_creating_credit_with_the_TRAINING: "Une erreur est survenue lors de la création du crédit avec la {{TRAINING}}." # angular interpolation - not_set: "Non défini" - error_a_credit_linking_this_machine_with_that_subscription_already_exists: "Erreur : un crédit associant cette machine et cet abonnement existe déjà." - changes_have_been_successfully_saved: "Les modifications ont bien été enregistrées." - credit_was_successfully_saved: "Le crédit a bien été enregistré." - do_you_really_want_to_delete_this_subscription_plan: "Êtes-vous sûr(e) de vouloir supprimer cette formule d'abonnement ?" - subscription_plan_was_successfully_deleted: "La formule d'abonnement a bien été supprimée." - unable_to_delete_the_specified_subscription_an_error_occurred: "Impossible de supprimer l'abonnement spécifié, une erreur s'est produite." - coupons: "Codes promotionnels" - list_of_the_coupons: "Liste des codes promotionnels" - discount: "Réduction" - nb_of_usages: "Nombre d'utilisations" - status: "Statut" - add_a_new_coupon: "Ajouter un code promotionnel" - disabled: "Désactivé" - expired: "Expiré" - sold_out: "Épuisé" - active: "Actif" - do_you_really_want_to_delete_this_coupon: "Êtes-vous sûr(e) de vouloir supprimer ce code promotionnel ?" - coupon_was_successfully_deleted: "Le code promotionnel a bien été supprimé." - unable_to_delete_the_specified_coupon_already_in_use: "Impossible de supprimer le code promotionnel : il est utilisé dans des factures." - unable_to_delete_the_specified_coupon_an_unexpected_error_occurred: "Impossible de supprimer le code promotionnel : une erreur inattendue s'est produite." - send_a_coupon: "Envoyer un code promo" - coupon: "Code promo" - usages: "Utilisations" - coupon_successfully_sent_to_USER: "Le code promotionnel a bien été envoyé à {{USER}}" # angular interpolation - an_error_occurred_unable_to_send_the_coupon: "Une erreur inattendue a empêché l'envoi du code promotionnel." + pricing: + pricing_management: "Gestion de la tarification" + subscriptions: "Abonnements" + trainings: "Formations" + list_of_the_subscription_plans: "Liste des formules d'abonnements" + beware_the_subscriptions_are_disabled_on_this_application: "Attention, les abonnements sont désactivés sur cette application." + you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager: "Vous pouvez tout de même en créer mais ils ne seront disponibles qu'après un redéploiement du projet par le responsable du serveur." + for_safety_reasons_please_dont_create_subscriptions_if_you_dont_want_intend_to_use_them_later: "Pour des raisons de sécurité, veuillez ne pas créer d'abonnements si vous ne comptez pas les utiliser par la suite." + add_a_new_subscription_plan: "Ajouter une nouvelle formule d'abonnement" + type: "Type" + partner: "Partenaire" + standard: "Standard" + name: "Nom" + duration: "Durée" + group: "Groupe" + prominence: "Importance" + price: "Prix" + machine_hours: "Heures machines" + these_prices_match_machine_hours_rates_: "Ces tarifs correspondent au prix d'une heure machine" + _without_subscriptions: "sans abonnement" + machines: "Machines" + credits: "Crédits" + subscription: "Abonnement" + related_trainings: "Formations associées" + add_a_machine_credit: "Ajouter un crédit Machine" + machine: "Machine" + hours: "Heures" + related_subscriptions: "Abonnements associés" + please_specify_a_number: "Veuillez spécifier un nombre." + none: "Aucune" # grammar note: concordance with "training". + an_error_occurred_while_saving_the_number_of_credits: "Une erreur est survenue lors de l'enregistrement du nombre de crédits." + an_error_occurred_while_deleting_credit_with_the_TRAINING: "Une erreur est survenue lors de la suppression du crédit avec la {{TRAINING}}." # angular interpolation + an_error_occurred_unable_to_find_the_credit_to_revoke: "Une erreur est survenue : impossible de retrouver le crédit à enlever." + an_error_occurred_while_creating_credit_with_the_TRAINING: "Une erreur est survenue lors de la création du crédit avec la {{TRAINING}}." # angular interpolation + not_set: "Non défini" + error_a_credit_linking_this_machine_with_that_subscription_already_exists: "Erreur : un crédit associant cette machine et cet abonnement existe déjà." + changes_have_been_successfully_saved: "Les modifications ont bien été enregistrées." + credit_was_successfully_saved: "Le crédit a bien été enregistré." + do_you_really_want_to_delete_this_subscription_plan: "Êtes-vous sûr(e) de vouloir supprimer cette formule d'abonnement ?" + subscription_plan_was_successfully_deleted: "La formule d'abonnement a bien été supprimée." + unable_to_delete_the_specified_subscription_an_error_occurred: "Impossible de supprimer l'abonnement spécifié, une erreur s'est produite." + coupons: "Codes promotionnels" + list_of_the_coupons: "Liste des codes promotionnels" + discount: "Réduction" + nb_of_usages: "Nombre d'utilisations" + status: "Statut" + add_a_new_coupon: "Ajouter un code promotionnel" + disabled: "Désactivé" + expired: "Expiré" + sold_out: "Épuisé" + active: "Actif" + confirmation_required: "Confirmation requise" + do_you_really_want_to_delete_this_coupon: "Êtes-vous sûr(e) de vouloir supprimer ce code promotionnel ?" + coupon_was_successfully_deleted: "Le code promotionnel a bien été supprimé." + unable_to_delete_the_specified_coupon_already_in_use: "Impossible de supprimer le code promotionnel : il est utilisé dans des factures." + unable_to_delete_the_specified_coupon_an_unexpected_error_occurred: "Impossible de supprimer le code promotionnel : une erreur inattendue s'est produite." + send_a_coupon: "Envoyer un code promo" + coupon: "Code promo" + usages: "Utilisations" + coupon_successfully_sent_to_USER: "Le code promotionnel a bien été envoyé à {{USER}}" # angular interpolation + an_error_occurred_unable_to_send_the_coupon: "Une erreur inattendue a empêché l'envoi du code promotionnel." + code: "Code" + enabled: "Activé" + validity_per_user: "Validité par utilisateur" + once: "Une seule fois" + forever: "À chaque utilisation" + valid_until: "Valable jusqu'au (inclus)" coupons_new: # ajouter un code promotionnel From 93bceb55171a4ffc433c574dc135f3ada43464d2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 14 Feb 2017 15:25:28 +0100 Subject: [PATCH 185/289] define spaces prices for non-subscribers --- .../controllers/admin/pricing.coffee.erb | 10 +++++-- app/assets/javascripts/router.coffee.erb | 6 +++++ .../templates/admin/pricing/index.html.erb | 4 +++ .../templates/admin/pricing/spaces.html.erb | 26 +++++++++++++++++++ config/locales/app.admin.en.yml | 2 ++ config/locales/app.admin.fr.yml | 2 ++ 6 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 app/assets/templates/admin/pricing/spaces.html.erb diff --git a/app/assets/javascripts/controllers/admin/pricing.coffee.erb b/app/assets/javascripts/controllers/admin/pricing.coffee.erb index 8144075bd..35b69d1c9 100644 --- a/app/assets/javascripts/controllers/admin/pricing.coffee.erb +++ b/app/assets/javascripts/controllers/admin/pricing.coffee.erb @@ -3,8 +3,8 @@ ## # Controller used in the prices edition page ## -Application.Controllers.controller "EditPricingController", ["$scope", "$state", '$uibModal', '$filter', 'TrainingsPricing', 'Credit', 'Pricing', 'Plan', 'Coupon', 'plans', 'groups', 'growl', 'machinesPricesPromise', 'Price', 'dialogs', 'trainingsPricingsPromise', 'trainingsPromise', 'machineCreditsPromise', 'machinesPromise', 'trainingCreditsPromise', 'couponsPromise', '_t' -, ($scope, $state, $uibModal, $filter, TrainingsPricing, Credit, Pricing, Plan, Coupon, plans, groups, growl, machinesPricesPromise, Price, dialogs, trainingsPricingsPromise, trainingsPromise, machineCreditsPromise, machinesPromise, trainingCreditsPromise, couponsPromise, _t) -> +Application.Controllers.controller "EditPricingController", ["$scope", "$state", '$uibModal', '$filter', 'TrainingsPricing', 'Credit', 'Pricing', 'Plan', 'Coupon', 'plans', 'groups', 'growl', 'machinesPricesPromise', 'Price', 'dialogs', 'trainingsPricingsPromise', 'trainingsPromise', 'machineCreditsPromise', 'machinesPromise', 'trainingCreditsPromise', 'couponsPromise', 'spacesPromise', 'spacesPricesPromise', '_t' +, ($scope, $state, $uibModal, $filter, TrainingsPricing, Credit, Pricing, Plan, Coupon, plans, groups, growl, machinesPricesPromise, Price, dialogs, trainingsPricingsPromise, trainingsPromise, machineCreditsPromise, machinesPromise, trainingCreditsPromise, couponsPromise, spacesPromise, spacesPricesPromise, _t) -> ### PUBLIC SCOPE ### ## List of machines prices (not considering any plan) @@ -37,6 +37,12 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", ## List of coupons $scope.coupons = couponsPromise + ## List of spaces + $scope.spaces = spacesPromise + + ## List of spaces prices (not considering any plan) + $scope.spacesPrices = spacesPricesPromise + ## The plans list ordering. Default: by group $scope.orderPlans = 'group_id' diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb index a7426eb8c..197a60fdc 100644 --- a/app/assets/javascripts/router.coffee.erb +++ b/app/assets/javascripts/router.coffee.erb @@ -824,6 +824,12 @@ angular.module('application.router', ['ui.router']). couponsPromise: ['Coupon', (Coupon) -> Coupon.query().$promise ] + spacesPromise: ['Space', (Space) -> + Space.query().$promise + ] + spacesPricesPromise: ['Price', (Price)-> + Price.query(priceable_type: 'Space', plan_id: 'null').$promise + ] # plans .state 'app.admin.plans', diff --git a/app/assets/templates/admin/pricing/index.html.erb b/app/assets/templates/admin/pricing/index.html.erb index bad193f0f..aa90fd967 100644 --- a/app/assets/templates/admin/pricing/index.html.erb +++ b/app/assets/templates/admin/pricing/index.html.erb @@ -33,6 +33,10 @@ + + + + diff --git a/app/assets/templates/admin/pricing/spaces.html.erb b/app/assets/templates/admin/pricing/spaces.html.erb new file mode 100644 index 000000000..a189ac4c4 --- /dev/null +++ b/app/assets/templates/admin/pricing/spaces.html.erb @@ -0,0 +1,26 @@ +
+ {{ 'pricing.these_prices_match_space_hours_rates_' | translate }} {{ 'pricing._without_subscriptions' }}. +
+
{{ 'trainings' }}{{ 'pricing.trainings' }} {{group.name}}
+ + + + + + + + + + + + +
{{ 'pricing.spaces' }} + {{group.name}} +
+ {{ space.name }} + + + {{ findPriceBy(spacesPrices, space.id, group.id).amount | currency}} + +
\ No newline at end of file diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 7f636cb89..91a611c2b 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -199,6 +199,8 @@ en: once: "Just once" forever: "Each use" valid_until: "Valid until (included)" + spaces: "Spaces" + these_prices_match_space_hours_rates_: "These prices match space hours rates" coupons_new: # ajouter un code promotionnel diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index bd572cd0e..e745e53e0 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -199,6 +199,8 @@ fr: once: "Une seule fois" forever: "À chaque utilisation" valid_until: "Valable jusqu'au (inclus)" + spaces: "Espaces" + these_prices_match_space_hours_rates_: "Ces tarifs correspondent au prix d'une heure espace" coupons_new: # ajouter un code promotionnel From 1554cfe65d453b73b7bb6a5f437b410269a06094 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 14 Feb 2017 16:09:07 +0100 Subject: [PATCH 186/289] refactor plan translations mapping --- .../controllers/admin/plans.coffee.erb | 10 ++++---- .../templates/admin/plans/edit.html.erb | 12 ++++----- app/assets/templates/admin/plans/new.html.erb | 2 +- config/locales/app.admin.en.yml | 25 +++++++++++-------- config/locales/app.admin.fr.yml | 25 +++++++++++-------- 5 files changed, 40 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/plans.coffee.erb b/app/assets/javascripts/controllers/admin/plans.coffee.erb index c632790b8..cd653e5d8 100644 --- a/app/assets/javascripts/controllers/admin/plans.coffee.erb +++ b/app/assets/javascripts/controllers/admin/plans.coffee.erb @@ -146,7 +146,7 @@ Application.Controllers.controller 'NewPlanController', ['$scope', '$uibModal', $scope.partner.name = "#{user.first_name} #{user.last_name}" $uibModalInstance.close($scope.partner) , (error)-> - growl.error(_t('unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name')) + growl.error(_t('new_plan.unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name')) $scope.cancel = -> $uibModalInstance.dismiss('cancel') ] @@ -164,9 +164,9 @@ Application.Controllers.controller 'NewPlanController', ['$scope', '$uibModal', ## $scope.afterSubmit = (content) -> if !content.id? and !content.plan_ids? - growl.error(_t('unable_to_create_the_subscription_please_try_again')) + growl.error(_t('new_plan.unable_to_create_the_subscription_please_try_again')) else - growl.success(_t('successfully_created_subscription(s)_dont_forget_to_redefine_prices')) + growl.success(_t('new_plan.successfully_created_subscription(s)_dont_forget_to_redefine_prices')) if content.plan_ids? $state.go('app.admin.pricing') else @@ -231,9 +231,9 @@ Application.Controllers.controller 'EditPlanController', ['$scope', 'groups', 'p ## $scope.afterSubmit = (content) -> if !content.id? and !content.plan_ids? - growl.error(_t('unable_to_save_subscription_changes_please_try_again')) + growl.error(_t('confirm_changes.unable_to_save_subscription_changes_please_try_again')) else - growl.success(_t('subscription_successfully_changed')) + growl.success(_t('confirm_changes.subscription_successfully_changed')) $state.go('app.admin.pricing') diff --git a/app/assets/templates/admin/plans/edit.html.erb b/app/assets/templates/admin/plans/edit.html.erb index cca5e564e..0de6998ec 100644 --- a/app/assets/templates/admin/plans/edit.html.erb +++ b/app/assets/templates/admin/plans/edit.html.erb @@ -7,7 +7,7 @@
-

{{ 'subscription_plan' | translate }} {{ plan.base_name }}

+

{{ 'edit_plan.subscription_plan' | translate }} {{ plan.base_name }}

@@ -30,19 +30,19 @@ -

{{ 'prices' }}

+

{{ 'edit_plan.prices' }}

- +
-

{{ 'machines' }}

+

{{ 'edit_plan.machines' }}

- - + + diff --git a/app/assets/templates/admin/plans/new.html.erb b/app/assets/templates/admin/plans/new.html.erb index f8c3d3a19..d1acc9cc6 100644 --- a/app/assets/templates/admin/plans/new.html.erb +++ b/app/assets/templates/admin/plans/new.html.erb @@ -7,7 +7,7 @@
-

{{ 'add_a_subscription_plan' }}

+

{{ 'new_plan.add_a_subscription_plan' }}

diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 91a611c2b..81fc43e03 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -214,19 +214,22 @@ en: plans: new: # add a subscription plan on the platform - add_a_subscription_plan: "Add a subscription plan" - unable_to_create_the_subscription_please_try_again: "Unable to create the subscription plan. Please try again." - successfully_created_subscription(s)_dont_forget_to_redefine_prices: "Subscription(s) successfully created. Don't forget to redefine prices." - unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Unable to save this user. Check that there isn't an already defined user with the same name." + new_plan: + add_a_subscription_plan: "Add a subscription plan" + unable_to_create_the_subscription_please_try_again: "Unable to create the subscription plan. Please try again." + successfully_created_subscription(s)_dont_forget_to_redefine_prices: "Subscription(s) successfully created. Don't forget to redefine prices." + unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Unable to save this user. Check that there isn't an already defined user with the same name." edit: # edit a subscription plan / machine hours prices - subscription_plan: "Subscription plan:" - prices: "Prices" - copy_prices_from: "Copy prices from" - machine: "Machine" - hourly_rate: "Hourly rate" - unable_to_save_subscription_changes_please_try_again: "Unable to save subscription changes. Please try again." - subscription_successfully_changed: "Subscription successfully changed." + edit_plan: + subscription_plan: "Subscription plan:" + prices: "Prices" + copy_prices_from: "Copy prices from" + machines: "Machines" + machine: "Machine" + hourly_rate: "Hourly rate" + unable_to_save_subscription_changes_please_try_again: "Unable to save subscription changes. Please try again." + subscription_successfully_changed: "Subscription successfully changed." invoices: # list of all invoices & invoicing parameters diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index e745e53e0..625274924 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -214,19 +214,22 @@ fr: plans: new: # ajouter une formule d'abonnement sur la plate-forme - add_a_subscription_plan: "Ajouter une formule d'abonnement" - unable_to_create_the_subscription_please_try_again: "L'abonnement n'a pas pu être créé. Veuillez réessayer." - successfully_created_subscription(s)_dont_forget_to_redefine_prices: "Création du/des abonnement(s) réussie. N'oubliez pas de redéfinir les tarifs." - unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Impossible d'enregistrer cet utilisateur. Vérifiez qu'il n'existe pas déjà un utilisateur du même nom." + new_plan: + add_a_subscription_plan: "Ajouter une formule d'abonnement" + unable_to_create_the_subscription_please_try_again: "L'abonnement n'a pas pu être créé. Veuillez réessayer." + successfully_created_subscription(s)_dont_forget_to_redefine_prices: "Création du/des abonnement(s) réussie. N'oubliez pas de redéfinir les tarifs." + unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Impossible d'enregistrer cet utilisateur. Vérifiez qu'il n'existe pas déjà un utilisateur du même nom." edit: # modifier une formule d'abonnement / les prix des heures machines - subscription_plan: "Formule d'abonnement :" - prices: "Tarifs" - copy_prices_from: "Copier les prix depuis" - machine: "Machine" - hourly_rate: "Tarif horaire" - unable_to_save_subscription_changes_please_try_again: "Les modifications de l'abonnement n'ont pas pu être enregistrées. Veuillez réessayer." - subscription_successfully_changed: "Modification de l'abonnement réussie." + edit_plan: + subscription_plan: "Formule d'abonnement :" + prices: "Tarifs" + copy_prices_from: "Copier les prix depuis" + machines: "Machines" + machine: "Machine" + hourly_rate: "Tarif horaire" + unable_to_save_subscription_changes_please_try_again: "Les modifications de l'abonnement n'ont pas pu être enregistrées. Veuillez réessayer." + subscription_successfully_changed: "Modification de l'abonnement réussie." invoices: # liste de toutes les factures & paramètres de facturation From 42819b18cb7f506f0de9875d4d4e0e91c5a777e9 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 14 Feb 2017 16:19:10 +0100 Subject: [PATCH 187/289] refactor plan form translations mapping --- .../templates/admin/plans/_form.html.erb | 56 +++++++++---------- config/locales/app.shared.en.yml | 54 ++++++++++-------- config/locales/app.shared.fr.yml | 54 ++++++++++-------- 3 files changed, 88 insertions(+), 76 deletions(-) diff --git a/app/assets/templates/admin/plans/_form.html.erb b/app/assets/templates/admin/plans/_form.html.erb index f68eced4c..0e7ed7465 100644 --- a/app/assets/templates/admin/plans/_form.html.erb +++ b/app/assets/templates/admin/plans/_form.html.erb @@ -1,19 +1,19 @@ -

{{ 'general_information' }}

+

{{ 'plan_form.general_information' }}

- + - {{ 'name_is_required' }} - {{ 'name_length_must_be_less_than_24_characters' }} + {{ 'plan_form.name_is_required' }} + {{ 'plan_form.name_length_must_be_less_than_24_characters' }}
- + - {{ 'type_is_required' }} + {{ 'plan_form.type_is_required' }}
- + - {{ 'group_is_required' }} + {{ 'plan_form.group_is_required' }}
- + - {{ 'period_is_required' }} + {{ 'plan_form.period_is_required' }}
- + - {{ 'number_of_periods_is_required' }} + {{ 'plan_form.number_of_periods_is_required' }}
- +
{{currencySymbol}}
- {{ 'price_is_required' }} + {{ 'plan_form.price_is_required' }}
- + - {{ 'on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list' | translate }} - {{ 'an_evelated_number_means_a_higher_prominence' | translate }} + {{ 'plan_form.on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list' | translate }} + {{ 'plan_form.an_evelated_number_means_a_higher_prominence' | translate }}
- + {{ (plan.is_rolling ? 'yes' : 'no') | translate }} - {{ 'a_rolling_subscription_will_begin_the_day_of_the_first_training' | translate }} - {{ 'otherwise_it_will_begin_as_soon_as_it_is_bought' | translate }} + {{ 'plan_form.a_rolling_subscription_will_begin_the_day_of_the_first_training' | translate }} + {{ 'plan_form.otherwise_it_will_begin_as_soon_as_it_is_bought' | translate }}
@@ -121,12 +121,12 @@ - +
{{file.attachment || plan.plan_file_attributes.attachment_identifier}}
- {{ 'attach_an_information_sheet' }} + {{ 'plan_form.attach_an_information_sheet' }} {{ 'change' }} @@ -135,7 +135,7 @@
- +
- +
- {{ 'as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user' }} + {{ 'plan_form.as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user' }}
diff --git a/config/locales/app.shared.en.yml b/config/locales/app.shared.en.yml index b4562de4e..c9687fe35 100644 --- a/config/locales/app.shared.en.yml +++ b/config/locales/app.shared.en.yml @@ -199,30 +199,36 @@ en: plan: # subscription plan edition form - general_information: "General information" - name_length_must_be_less_than_24_characters: "Name length must be less than 24 characters." - type_is_required: "Type is required." - group: "Group" - transversal_(all_groups): "Transversal (all groups)" - group_is_required: "Group is required." - number_of_periods: "Number of periods" - number_of_periods_is_required: "Number of periods is required." - period: "Period" - period_is_required: "Period is required." - price_is_required: "Price is required." - visual_prominence_of_the_subscription: "Visual prominence of the subscription" - on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list: "On the subscriptions page, the most prominent subscriptions will be placed at the top of the list." - an_evelated_number_means_a_higher_prominence: "An elevated number means a higher prominence." - rolling_subscription: "Rolling subscription?" - a_rolling_subscription_will_begin_the_day_of_the_first_training: "A rolling subscription will begin the day of the first trainings." - otherwise_it_will_begin_as_soon_as_it_is_bought: "Otherwise, it will begin as soon as it is bought." - information_sheet: "Information sheet" - attach_an_information_sheet: "Attach an information sheet" - notified_partner: "Notified partner" - new_user: "New user ..." - as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "As part of a partner subscription, some notifications may be sent to this user." - new_partner: "New partner" - email_address_is_required: "Email address is required." + plan_form: + general_information: "General information" + name: "Name" + name_length_must_be_less_than_24_characters: "Name length must be less than 24 characters." + type: "Type" + type_is_required: "Type is required." + group: "Group" + transversal_(all_groups): "Transversal (all groups)" + group_is_required: "Group is required." + number_of_periods: "Number of periods" + number_of_periods_is_required: "Number of periods is required." + period: "Period" + year: "Year" + month: "Month" + period_is_required: "Period is required." + subscription_price: "Subscription price" + price_is_required: "Price is required." + visual_prominence_of_the_subscription: "Visual prominence of the subscription" + on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list: "On the subscriptions page, the most prominent subscriptions will be placed at the top of the list." + an_evelated_number_means_a_higher_prominence: "An elevated number means a higher prominence." + rolling_subscription: "Rolling subscription?" + a_rolling_subscription_will_begin_the_day_of_the_first_training: "A rolling subscription will begin the day of the first trainings." + otherwise_it_will_begin_as_soon_as_it_is_bought: "Otherwise, it will begin as soon as it is bought." + information_sheet: "Information sheet" + attach_an_information_sheet: "Attach an information sheet" + notified_partner: "Notified partner" + new_user: "New user ..." + as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "As part of a partner subscription, some notifications may be sent to this user." + new_partner: "New partner" + email_address_is_required: "Email address is required." trainings: # training edition form diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 28501ec43..c5678d59c 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -199,30 +199,36 @@ fr: plan: # formulaire d'édition d'une formule d'abonnement - general_information: "Informations générales" - name_length_must_be_less_than_24_characters: "Le nom doit faire moins de 24 caractères." - type_is_required: "Le type est requis." - group: "Groupe" - transversal_(all_groups): "Transversal (tout les groupes)" - group_is_required: "Le groupe est requis." - number_of_periods: "Nombre de périodes" - number_of_periods_is_required: "Le nombre de périodes est requis." - period: "Période" - period_is_required: "La période est requise." - price_is_required: "Le prix est requis." - visual_prominence_of_the_subscription: "Importance visuelle de l'abonnement" - on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list: "Sur la page des abonnements, les abonnements les plus importants seront placés en haut de la liste." - an_evelated_number_means_a_higher_prominence: "Un nombre plus élevé traduit une importance plus élevée." - rolling_subscription: "Abonnement glissant ?" - a_rolling_subscription_will_begin_the_day_of_the_first_training: "Un abonnement glissant prendra effet seulement le jour de la première formation." - otherwise_it_will_begin_as_soon_as_it_is_bought: "Dans le cas contraire, il prendra effet dès sa date d'achat." - information_sheet: "Fiche descriptive" - attach_an_information_sheet: "Joindre une fiche descriptive" - notified_partner: "Partenaire notifié" - new_user: "Nouvel utilisateur ..." - as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "Dans le cadre d'un abonnement partenaire, certaines notifications pourront être adressées à cet utilisateur." - new_partner: "Nouveau partenaire" - email_address_is_required: "L'adresse e-mail est requise." + plan_form: + general_information: "Informations générales" + name: "Nom" + name_length_must_be_less_than_24_characters: "Le nom doit faire moins de 24 caractères." + type: "Type" + type_is_required: "Le type est requis." + group: "Groupe" + transversal_(all_groups): "Transversal (tout les groupes)" + group_is_required: "Le groupe est requis." + number_of_periods: "Nombre de périodes" + number_of_periods_is_required: "Le nombre de périodes est requis." + period: "Période" + year: "Année" + month: "Mois" + period_is_required: "La période est requise." + subscription_price: "Coût de l'abonnement" + price_is_required: "Le prix est requis." + visual_prominence_of_the_subscription: "Importance visuelle de l'abonnement" + on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list: "Sur la page des abonnements, les abonnements les plus importants seront placés en haut de la liste." + an_evelated_number_means_a_higher_prominence: "Un nombre plus élevé traduit une importance plus élevée." + rolling_subscription: "Abonnement glissant ?" + a_rolling_subscription_will_begin_the_day_of_the_first_training: "Un abonnement glissant prendra effet seulement le jour de la première formation." + otherwise_it_will_begin_as_soon_as_it_is_bought: "Dans le cas contraire, il prendra effet dès sa date d'achat." + information_sheet: "Fiche descriptive" + attach_an_information_sheet: "Joindre une fiche descriptive" + notified_partner: "Partenaire notifié" + new_user: "Nouvel utilisateur ..." + as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "Dans le cadre d'un abonnement partenaire, certaines notifications pourront être adressées à cet utilisateur." + new_partner: "Nouveau partenaire" + email_address_is_required: "L'adresse e-mail est requise." trainings: # formulaire d'édition d'une formation From ec4a06a0e43fde611eb45da037515c156e58ec43 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 14 Feb 2017 17:06:42 +0100 Subject: [PATCH 188/289] interface to configure space price per plan + refactored plans interface code --- .../controllers/admin/plans.coffee.erb | 87 ++++++++++--------- app/assets/javascripts/router.coffee.erb | 15 ++-- .../templates/admin/plans/edit.html.erb | 23 ++++- config/locales/app.admin.en.yml | 2 + config/locales/app.admin.fr.yml | 2 + 5 files changed, 80 insertions(+), 49 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/plans.coffee.erb b/app/assets/javascripts/controllers/admin/plans.coffee.erb index cd653e5d8..e235ee01b 100644 --- a/app/assets/javascripts/controllers/admin/plans.coffee.erb +++ b/app/assets/javascripts/controllers/admin/plans.coffee.erb @@ -6,7 +6,7 @@ class PlanController - constructor: ($scope, groups, plans, machines, prices, partners, CSRF) -> + constructor: ($scope, groups, prices, partners, CSRF) -> # protection against request forgery CSRF.setMetaTags() @@ -15,12 +15,6 @@ class PlanController ## groups list $scope.groups = groups - ## plans list - $scope.plans = plans - - ## machines list - $scope.machines = machines - ## users with role 'partner', notifiables for a partner plan $scope.partners = partners.users @@ -48,38 +42,11 @@ class PlanController - ## - # Retrieve a plan from its numeric identifier - # @param id {number} plan ID - # @returns {Object} Plan, inherits from $resource - ## - $scope.getPlanFromId = (id) -> - for plan in $scope.plans - if plan.id == id - return plan - - - - ## - # Retrieve the name of a machine from its ID - # @param machine_id {number} machine identifier - # @returns {string} Machine's name - ## - $scope.getMachineName = (machine_id) -> - for machine in $scope.machines - if machine.id == machine_id - return machine.name - - - - - - ## # Controller used in the plan creation form ## -Application.Controllers.controller 'NewPlanController', ['$scope', '$uibModal', 'groups', 'plans', 'machines', 'prices', 'partners', 'CSRF', '$state', 'growl', '_t' -, ($scope, $uibModal, groups, plans, machines, prices, partners, CSRF, $state, growl, _t) -> +Application.Controllers.controller 'NewPlanController', ['$scope', '$uibModal', 'groups', 'prices', 'partners', 'CSRF', '$state', 'growl', '_t' +, ($scope, $uibModal, groups, prices, partners, CSRF, $state, growl, _t) -> @@ -175,7 +142,7 @@ Application.Controllers.controller 'NewPlanController', ['$scope', '$uibModal', - new PlanController($scope, groups, plans, machines, prices, partners, CSRF) + new PlanController($scope, groups, prices, partners, CSRF) ] @@ -183,13 +150,25 @@ Application.Controllers.controller 'NewPlanController', ['$scope', '$uibModal', ## # Controller used in the plan edition form ## -Application.Controllers.controller 'EditPlanController', ['$scope', 'groups', 'plans', 'planPromise', 'machines', 'prices', 'partners', 'CSRF', '$state', '$stateParams', 'growl', '$filter', '_t', 'Plan' -, ($scope, groups, plans, planPromise, machines, prices, partners, CSRF, $state, $stateParams, growl, $filter, _t, Plan) -> +Application.Controllers.controller 'EditPlanController', ['$scope', 'groups', 'plans', 'planPromise', 'machines', 'spaces', 'prices', 'partners', 'CSRF', '$state', '$stateParams', 'growl', '$filter', '_t', 'Plan' +, ($scope, groups, plans, planPromise, machines, spaces, prices, partners, CSRF, $state, $stateParams, growl, $filter, _t, Plan) -> ### PUBLIC SCOPE ### + + ## List of spaces + $scope.spaces = spaces + + ## List of plans + $scope.plans = plans + + ## List of machines + $scope.machines = machines + + ## List of groups $scope.groups = groups + ## current form is used for edition mode $scope.mode = 'edition' @@ -231,9 +210,9 @@ Application.Controllers.controller 'EditPlanController', ['$scope', 'groups', 'p ## $scope.afterSubmit = (content) -> if !content.id? and !content.plan_ids? - growl.error(_t('confirm_changes.unable_to_save_subscription_changes_please_try_again')) + growl.error(_t('edit_plan.unable_to_save_subscription_changes_please_try_again')) else - growl.success(_t('confirm_changes.subscription_successfully_changed')) + growl.success(_t('edit_plan.subscription_successfully_changed')) $state.go('app.admin.pricing') @@ -251,6 +230,30 @@ Application.Controllers.controller 'EditPlanController', ['$scope', 'groups', 'p + ## + # Retrieve the name of a machine from its ID + # @param machine_id {number} machine identifier + # @returns {string} Machine's name + ## + $scope.getMachineName = (machine_id) -> + for machine in $scope.machines + if machine.id == machine_id + return machine.name + + + + ## + # Retrieve the name of a space from its ID + # @param space_id {number} space identifier + # @returns {string} Space's name + ## + $scope.getSpaceName = (space_id) -> + for space in $scope.spaces + if space.id == space_id + return space.name + + + ### PRIVATE SCOPE ### ## @@ -258,7 +261,7 @@ Application.Controllers.controller 'EditPlanController', ['$scope', 'groups', 'p ## initialize = -> # Using the PlansController - new PlanController($scope, groups, plans, machines, prices, partners, CSRF) + new PlanController($scope, groups, prices, partners, CSRF) ## !!! MUST BE CALLED AT THE END of the controller initialize() diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb index 197a60fdc..f72e9cf31 100644 --- a/app/assets/javascripts/router.coffee.erb +++ b/app/assets/javascripts/router.coffee.erb @@ -838,15 +838,9 @@ angular.module('application.router', ['ui.router']). prices: ['Pricing', (Pricing) -> Pricing.query().$promise ] - machines: ['Machine', (Machine) -> - Machine.query().$promise - ] groups: ['Group', (Group) -> Group.query().$promise ] - plans: ['Plan', (Plan) -> - Plan.query().$promise - ] partners: ['User', (User) -> User.query({role: 'partner'}).$promise ] @@ -867,6 +861,15 @@ angular.module('application.router', ['ui.router']). templateUrl: '<%= asset_path "admin/plans/edit.html" %>' controller: 'EditPlanController' resolve: + spaces: ['Space', (Space) -> + Space.query().$promise + ] + machines: ['Machine', (Machine) -> + Machine.query().$promise + ] + plans: ['Plan', (Plan) -> + Plan.query().$promise + ] planPromise: ['Plan', '$stateParams', (Plan, $stateParams) -> Plan.get({id: $stateParams.id}).$promise ] diff --git a/app/assets/templates/admin/plans/edit.html.erb b/app/assets/templates/admin/plans/edit.html.erb index 0de6998ec..a8e57b7c2 100644 --- a/app/assets/templates/admin/plans/edit.html.erb +++ b/app/assets/templates/admin/plans/edit.html.erb @@ -46,7 +46,7 @@
- +
{{ 'machine' }}{{ 'hourly_rate' }}{{ 'edit_plan.machine' }}{{ 'edit_plan.hourly_rate' }}
{{ getMachineName(price.priceable_id) }} (id {{ price.priceable_id }}) *
@@ -59,6 +59,27 @@
+

{{ 'edit_plan.spaces' }}

+ + + + + + + + + + + + +
{{ 'edit_plan.space' }}{{ 'edit_plan.hourly_rate' }}
{{ getSpaceName(price.priceable_id) }} * +
+ {{currencySymbol}} + + +
+
+
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 81fc43e03..c917765f5 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -228,6 +228,8 @@ en: machines: "Machines" machine: "Machine" hourly_rate: "Hourly rate" + spaces: "Spaces" + space: "Space" unable_to_save_subscription_changes_please_try_again: "Unable to save subscription changes. Please try again." subscription_successfully_changed: "Subscription successfully changed." diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 625274924..3d66d4a06 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -228,6 +228,8 @@ fr: machines: "Machines" machine: "Machine" hourly_rate: "Tarif horaire" + spaces: "Espaces" + space: "Espace" unable_to_save_subscription_changes_please_try_again: "Les modifications de l'abonnement n'ont pas pu être enregistrées. Veuillez réessayer." subscription_successfully_changed: "Modification de l'abonnement réussie." From 36a0eafef3977a86b858a289c72f99104b1db598 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 14 Feb 2017 17:29:52 +0100 Subject: [PATCH 189/289] interface to set credits for spaces --- .../controllers/admin/pricing.coffee.erb | 84 +++++++++++++++++-- app/assets/javascripts/router.coffee.erb | 3 + .../templates/admin/pricing/credits.html.erb | 52 ++++++++++++ config/locales/app.admin.en.yml | 3 + config/locales/app.admin.fr.yml | 3 + 5 files changed, 139 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/pricing.coffee.erb b/app/assets/javascripts/controllers/admin/pricing.coffee.erb index 35b69d1c9..c77e181e4 100644 --- a/app/assets/javascripts/controllers/admin/pricing.coffee.erb +++ b/app/assets/javascripts/controllers/admin/pricing.coffee.erb @@ -3,8 +3,8 @@ ## # Controller used in the prices edition page ## -Application.Controllers.controller "EditPricingController", ["$scope", "$state", '$uibModal', '$filter', 'TrainingsPricing', 'Credit', 'Pricing', 'Plan', 'Coupon', 'plans', 'groups', 'growl', 'machinesPricesPromise', 'Price', 'dialogs', 'trainingsPricingsPromise', 'trainingsPromise', 'machineCreditsPromise', 'machinesPromise', 'trainingCreditsPromise', 'couponsPromise', 'spacesPromise', 'spacesPricesPromise', '_t' -, ($scope, $state, $uibModal, $filter, TrainingsPricing, Credit, Pricing, Plan, Coupon, plans, groups, growl, machinesPricesPromise, Price, dialogs, trainingsPricingsPromise, trainingsPromise, machineCreditsPromise, machinesPromise, trainingCreditsPromise, couponsPromise, spacesPromise, spacesPricesPromise, _t) -> +Application.Controllers.controller "EditPricingController", ["$scope", "$state", '$uibModal', '$filter', 'TrainingsPricing', 'Credit', 'Pricing', 'Plan', 'Coupon', 'plans', 'groups', 'growl', 'machinesPricesPromise', 'Price', 'dialogs', 'trainingsPricingsPromise', 'trainingsPromise', 'machineCreditsPromise', 'machinesPromise', 'trainingCreditsPromise', 'couponsPromise', 'spacesPromise', 'spacesPricesPromise', 'spacesCreditsPromise', '_t' +, ($scope, $state, $uibModal, $filter, TrainingsPricing, Credit, Pricing, Plan, Coupon, plans, groups, growl, machinesPricesPromise, Price, dialogs, trainingsPricingsPromise, trainingsPromise, machineCreditsPromise, machinesPromise, trainingCreditsPromise, couponsPromise, spacesPromise, spacesPricesPromise, spacesCreditsPromise, _t) -> ### PUBLIC SCOPE ### ## List of machines prices (not considering any plan) @@ -40,6 +40,9 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", ## List of spaces $scope.spaces = spacesPromise + ## Associate free space hours with subscriptions + $scope.spaceCredits = spacesCreditsPromise + ## List of spaces prices (not considering any plan) $scope.spacesPrices = spacesPricesPromise @@ -185,9 +188,14 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", $scope.showCreditableName = (credit) -> selected = _t('pricing.not_set') if credit and credit.creditable_id - angular.forEach $scope.machines, (m)-> - if m.id == credit.creditable_id - selected = m.name+' ( id. '+m.id+' )' + if credit.creditable_type == 'Machine' + angular.forEach $scope.machines, (m)-> + if m.id == credit.creditable_id + selected = m.name + ' ( id. ' + m.id + ' )' + else if credit.creditable_type == 'Space' + angular.forEach $scope.spaces, (s)-> + if s.id == credit.creditable_id + selected = s.name return selected @@ -221,7 +229,7 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", ## # Removes the newly inserted but not saved machine credit / Cancel the current machine credit modification # @param rowform {Object} see http://vitalets.github.io/angular-xeditable/ - # @param index {number} theme index in the $scope.machineCredits array + # @param index {number} credit index in the $scope.machineCredits array ## $scope.cancelMachineCredit = (rowform, index) -> if $scope.machineCredits[index].id? @@ -241,6 +249,70 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state", + ## + # Create a new empty entry in the $scope.spaceCredits array + # @param e {Object} see https://docs.angularjs.org/guide/expression#-event- + ## + $scope.addSpaceCredit = (e)-> + e.preventDefault() + e.stopPropagation() + $scope.inserted = + creditable_type: 'Space' + $scope.spaceCredits.push($scope.inserted) + $scope.status.isopen = !$scope.status.isopen + + + + ## + # Validation callback when editing space's credits. Save the changes. + # This will prevent the creation of two credits associated with the same space and plan. + # @param data {Object} space, associated plan and number of credit hours. + # @param [id] {number} credit id for edition, create a new credit object if not provided + ## + $scope.saveSpaceCredit = (data, id) -> + for sc in $scope.spaceCredits + if sc.plan_id == data.plan_id and sc.creditable_id == data.creditable_id and (id == null or sc.id != id) + growl.error(_t('pricing.error_a_credit_linking_this_space_with_that_subscription_already_exists')) + unless id + $scope.spaceCredits.pop() + return false + + if id? + Credit.update {id: id}, credit: data, -> + growl.success(_t('pricing.changes_have_been_successfully_saved')) + else + data.creditable_type = 'Space' + Credit.save + credit: data + , (resp) -> + $scope.spaceCredits[$scope.spaceCredits.length - 1].id = resp.id + growl.success(_t('pricing.credit_was_successfully_saved')) + + + + ## + # Removes the newly inserted but not saved space credit / Cancel the current space credit modification + # @param rowform {Object} see http://vitalets.github.io/angular-xeditable/ + # @param index {number} credit index in the $scope.spaceCredits array + ## + $scope.cancelSpaceCredit = (rowform, index) -> + if $scope.spaceCredits[index].id? + rowform.$cancel() + else + $scope.spaceCredits.splice(index, 1) + + + + ## + # Deletes the space credit at the specified index + # @param index {number} space credit index in the $scope.spaceCredits array + ## + $scope.removeSpaceCredit = (index) -> + Credit.delete $scope.spaceCredits[index] + $scope.spaceCredits.splice(index, 1) + + + ## # If the plan does not have a type, return a default value for display purposes # @param type {string|undefined|null} plan's type (eg. 'partner') diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb index f72e9cf31..db4830172 100644 --- a/app/assets/javascripts/router.coffee.erb +++ b/app/assets/javascripts/router.coffee.erb @@ -830,6 +830,9 @@ angular.module('application.router', ['ui.router']). spacesPricesPromise: ['Price', (Price)-> Price.query(priceable_type: 'Space', plan_id: 'null').$promise ] + spacesCreditsPromise: ['Credit', (Credit) -> + Credit.query({creditable_type: 'Space'}).$promise + ] # plans .state 'app.admin.plans', diff --git a/app/assets/templates/admin/pricing/credits.html.erb b/app/assets/templates/admin/pricing/credits.html.erb index 0534e5780..b9647dec1 100644 --- a/app/assets/templates/admin/pricing/credits.html.erb +++ b/app/assets/templates/admin/pricing/credits.html.erb @@ -94,4 +94,56 @@
+ +

{{ 'pricing.spaces' }}

+
+ +
+ + + + + + + + + + + + + + + + +
{{ 'pricing.space' }}{{ 'pricing.hours' }}{{ 'pricing.related_subscriptions' }}
+ + {{ showCreditableName(sc) }} + + + + {{ sc.hours }} + + + + {{ getPlanFromId(sc.plan_id) | humanReadablePlanName: groups: 'short' }} + + +
+ + +
+
+ + +
+
\ No newline at end of file diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index c917765f5..0be778bd6 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -201,6 +201,9 @@ en: valid_until: "Valid until (included)" spaces: "Spaces" these_prices_match_space_hours_rates_: "These prices match space hours rates" + add_a_space_credit: "Add a Space credit" + space: "Espace" + error_a_credit_linking_this_space_with_that_subscription_already_exists: "Error : a credit linking this space with that subscription already exists." coupons_new: # ajouter un code promotionnel diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 3d66d4a06..27f917329 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -201,6 +201,9 @@ fr: valid_until: "Valable jusqu'au (inclus)" spaces: "Espaces" these_prices_match_space_hours_rates_: "Ces tarifs correspondent au prix d'une heure espace" + add_a_space_credit: "Ajouter un crédit Espace" + space: "Espace" + error_a_credit_linking_this_space_with_that_subscription_already_exists: "Erreur : un crédit associant cet espace et cet abonnement existe déjà." coupons_new: # ajouter un code promotionnel From 30454c4262be1128ceed0246ba36056ce1134afa Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 15 Feb 2017 09:48:27 +0100 Subject: [PATCH 190/289] manage space info message + refactor settings translations mapping --- .../controllers/admin/settings.coffee | 5 +- app/assets/javascripts/router.coffee.erb | 1 + .../templates/admin/settings/about.html | 10 +- .../templates/admin/settings/general.html | 82 +++++---- .../templates/admin/settings/home_page.html | 10 +- .../templates/admin/settings/index.html.erb | 10 +- .../admin/settings/reservations.html | 40 ++-- app/models/setting.rb | 3 +- config/locales/app.admin.en.yml | 171 +++++++++--------- config/locales/app.admin.fr.yml | 171 +++++++++--------- 10 files changed, 260 insertions(+), 243 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/settings.coffee b/app/assets/javascripts/controllers/admin/settings.coffee index a1e3b94a8..1bb3ff416 100644 --- a/app/assets/javascripts/controllers/admin/settings.coffee +++ b/app/assets/javascripts/controllers/admin/settings.coffee @@ -46,6 +46,7 @@ Application.Controllers.controller "SettingsController", ["$scope", 'Setting', ' $scope.trainingInformationMessage = { name: 'training_information_message', value: settingsPromise.training_information_message} $scope.subscriptionExplicationsAlert = { name: 'subscription_explications_alert', value: settingsPromise.subscription_explications_alert } $scope.eventExplicationsAlert = {name: 'event_explications_alert', value: settingsPromise.event_explications_alert } + $scope.spaceExplicationsAlert = { name: 'space_explications_alert', value: settingsPromise.space_explications_alert } $scope.windowStart = { name: 'booking_window_start', value: settingsPromise.booking_window_start } $scope.windowEnd = { name: 'booking_window_end', value: settingsPromise.booking_window_end } $scope.mainColorSetting = { name: 'main_color', value: settingsPromise.main_color } @@ -116,7 +117,7 @@ Application.Controllers.controller "SettingsController", ["$scope", 'Setting', ' value = setting.value Setting.update { name: setting.name }, { value: value }, (data)-> - growl.success(_t('customization_of_SETTING_successfully_saved', {SETTING:_t(setting.name)})) + growl.success(_t('settings.customization_of_SETTING_successfully_saved', { SETTING:_t('settings.' + setting.name) })) , (error)-> console.log(error) @@ -135,7 +136,7 @@ Application.Controllers.controller "SettingsController", ["$scope", 'Setting', ' angular.forEach v, (err)-> growl.error(err) else - growl.success(_t('file_successfully_updated')) + growl.success(_t('settings.file_successfully_updated')) if content.custom_asset.name is 'cgu-file' $scope.cguFile = content.custom_asset $scope.methods.cgu = 'put' diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb index db4830172..9bd025dff 100644 --- a/app/assets/javascripts/router.coffee.erb +++ b/app/assets/javascripts/router.coffee.erb @@ -1104,6 +1104,7 @@ angular.module('application.router', ['ui.router']). 'training_information_message', 'subscription_explications_alert', 'event_explications_alert', + 'space_explications_alert', 'booking_window_start', 'booking_window_end', 'booking_move_enable', diff --git a/app/assets/templates/admin/settings/about.html b/app/assets/templates/admin/settings/about.html index 9adf2b614..09e96e347 100644 --- a/app/assets/templates/admin/settings/about.html +++ b/app/assets/templates/admin/settings/about.html @@ -3,8 +3,8 @@
-

- {{ 'shift_enter_to_force_carriage_return' | translate }} +

+ {{ 'settings.shift_enter_to_force_carriage_return' | translate }}
@@ -12,7 +12,7 @@
-
@@ -20,12 +20,12 @@
-
- {{ 'shift_enter_to_force_carriage_return' | translate }} + {{ 'settings.shift_enter_to_force_carriage_return' | translate }}
diff --git a/app/assets/templates/admin/settings/general.html b/app/assets/templates/admin/settings/general.html index 04bbee272..fc4aae90e 100644 --- a/app/assets/templates/admin/settings/general.html +++ b/app/assets/templates/admin/settings/general.html @@ -1,16 +1,16 @@
- {{ 'title' }} + {{ 'settings.title' }}
- +
- +
@@ -19,13 +19,13 @@
-

{{ 'title_concordance' }}

+

{{ 'settings.title_concordance' }}

- +
- +
@@ -36,15 +36,15 @@
- {{ 'customize_information_messages' }} + {{ 'settings.customize_information_messages' }}
-

{{ 'message_of_the_machine_booking_page' }}

-
+
@@ -52,8 +52,8 @@
-

{{ 'warning_message_of_the_training_booking_page'}}

-
+
@@ -61,8 +61,8 @@
-

{{ 'information_message_of_the_training_reservation_page'}}

-
+
@@ -70,38 +70,46 @@
-

{{ 'message_of_the_subscriptions_page' }}

-
+
-

{{ 'message_of_the_events_page' }}

-
+
+
+

{{ 'settings.message_of_the_spaces_page' }}

+
+
+ +
- {{ 'legal_documents'}} + {{ 'settings.legal_documents'}}
- {{ 'if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user' }} + {{ 'settings.if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user' }}
- +
@@ -125,7 +133,7 @@ - +
@@ -150,21 +158,21 @@
- {{ 'customize_the_graphics' }} + {{ 'settings.customize_the_graphics' }}
- {{ 'for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height' }}
- {{ 'concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels' }}
+ {{ 'settings.for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height' }}
+ {{ 'settings.concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels' }}

- {{ 'remember_to_refresh_the_page_for_the_changes_to_take_effect' }} + {{ 'settings.remember_to_refresh_the_page_for_the_changes_to_take_effect' }}
-

{{ 'logo_(white_background)' }}

+

{{ 'settings.logo_(white_background)' }}