diff --git a/.fabmanager-version b/.fabmanager-version
index a021d2559..84a98500c 100644
--- a/.fabmanager-version
+++ b/.fabmanager-version
@@ -1 +1 @@
-2.4.0-dev
\ No newline at end of file
+2.5.0-dev
\ No newline at end of file
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.
diff --git a/.gitignore b/.gitignore
index ee0e0fc32..9a35a3571 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp
+/coverage
/public/uploads
/public/assets
@@ -39,5 +40,8 @@
.vagrant
.docker
+# Do not versionate coveralls token
+.coveralls.yml
+
# Plugins are versioned is their own repository
/plugins/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1d758255..0b17a1c82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,119 @@
# Changelog Fab Manager
-## next release
-- Project images will show in full-size on a click
+## next release (v2.5.0)
+- Ability to remove an unused custom price for an event (#61)
+- Prevent polling notifications when the application is in background
+- Ability to export the availabilities and their reservation rate from the admin calendar
+- Ability to create, manage and reserve spaces
+- Improved admin's interface to create availabilities
+- Complete rewrote of the reservation cart functionality with improved stability, performance and sustainability
+- Replaced letter_opener by MailCatcher to preview e-mails in development environments
+- Fix a bug: trainings reservations are not shown in the admin's calendar
+- Fix a bug: unable to delete an administrator from the system
+- Fix a bug: unable to delete an event with a linked custom price (#61)
+- Fix a bug: navigation in client calendar is bogus when browsing months (#59)
+- [TODO DEPLOY] `rake db:migrate`, then `rake db:seed`
+- [TODO DEPLOY] add the `FABLAB_WITHOUT_SPACES` environment variable
+- [TODO DEPLOY] `rake fablab:es_add_spaces`
+
+## v2.4.10 2017 January 9
+
+- 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
+- Fix a bug: ReservationReminderWorker crash with undefined method find_by
+- Fix a bug: navigation to about page duplicates admin's links in left menu
+- Fix a bug: changing the price of a plan lost its past statistics
+- [TODO DEPLOY] `rake db:migrate`
+- [TODO DEPLOY] `rake fablab:set_plans_slugs`
+
+## 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
+- 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 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 (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] `rake 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
+
+- 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
+
+- 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 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
+
+## v2.4.5 2016 November 29
+
+- Ability to create coupons with cash amounts (previously only percentages were allowed)
+- Improved error messages when something wrong append when paying a machine reservation by stripe
+- Ability to display optional information message on event reservation page
+- Fix a bug: misconfigured Twitter's ENV variables results in HTTP error 500
+- Fix a bug: wallet is not debited when paying locally with a user who have invoices disabled
+- Fix a bug: wrong error message about rounding inconsistency is logged on invoice generation
+- Fix a bug: reservation calendar of a specific training shows availabilities for all trainings
+- [TODO DEPLOY] `rake db:migrate`
+
+## v2.4.4 2016 November 24
+
+- Fix a bug: unable to rollback migration 20160906145713
+- Fix a bug: Title's translation for plan's forms is not loaded in French
+- Fix a bug: invoice of reservation show payment by debit card when user pay with wallet
+
+## 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: 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
+
+- 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
+- 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
+
+- 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
- 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
@@ -16,14 +128,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
@@ -38,25 +150,29 @@
- 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
+- 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)
- 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`
- [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
@@ -76,7 +192,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
@@ -92,7 +208,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
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
diff --git a/Gemfile b/Gemfile
index b0250b9a7..0796722e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,7 +40,7 @@ end
group :development do
# Preview mail in the browser
- gem 'letter_opener'
+ gem 'mailcatcher'
gem 'awesome_print'
gem "puma"
@@ -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
@@ -62,6 +64,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 b80aa12bb..01219da99 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)
@@ -94,13 +96,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)
@@ -118,8 +120,15 @@ 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)
+ daemons (1.2.4)
database_cleaner (1.4.1)
debug_inspector (0.0.2)
descendants_tracker (0.0.4)
@@ -133,6 +142,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)
@@ -157,7 +167,8 @@ GEM
multi_json
equalizer (0.0.11)
erubis (2.7.0)
- execjs (2.4.0)
+ eventmachine (1.0.9.1)
+ execjs (2.7.0)
faker (1.4.3)
i18n (~> 0.5)
faraday (0.9.1)
@@ -177,6 +188,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)
@@ -207,23 +219,27 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.3)
- launchy (2.4.3)
- addressable (~> 2.3)
- letter_opener (1.3.0)
- launchy (~> 2.2)
libv8 (3.16.14.11)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
+ mailcatcher (0.6.5)
+ eventmachine (= 1.0.9.1)
+ mail (~> 2.3)
+ rack (~> 1.5)
+ sinatra (~> 1.2)
+ skinny (~> 0.2.3)
+ sqlite3 (~> 1.3)
+ thin (~> 1.5.0)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
message_format (0.0.3)
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 +257,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)
@@ -264,7 +281,14 @@ 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)
pdf-core (~> 0.5.1)
ttfunk (~> 1.4.0)
@@ -313,7 +337,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)
@@ -333,6 +357,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
@@ -363,10 +388,18 @@ 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)
tilt (>= 1.3, < 3)
+ skinny (0.2.4)
+ eventmachine (~> 1.0.0)
+ thin (>= 1.5, < 1.7)
spring (1.3.5)
sprockets (2.12.4)
hike (~> 1.2)
@@ -377,19 +410,27 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
+ sqlite3 (1.3.13)
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)
libv8 (~> 3.16.14.0)
ref
+ thin (1.5.1)
+ daemons (>= 1.0.9)
+ eventmachine (>= 0.12.6)
+ rack (>= 1.0.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
timers (4.0.1)
hitimes
+ tins (1.13.0)
ttfunk (1.4.0)
twitter (5.14.0)
addressable (~> 2.3)
@@ -460,6 +501,7 @@ DEPENDENCIES
chroma
coffee-rails (~> 4.1.0)
compass-rails (= 2.0.4)
+ coveralls
database_cleaner
devise
devise-async
@@ -477,7 +519,7 @@ DEPENDENCIES
jbuilder_cache_multi
jquery-rails
kaminari
- letter_opener
+ mailcatcher
message_format
mini_magick
minitest-reporters
@@ -486,6 +528,7 @@ DEPENDENCIES
omniauth
omniauth-oauth2
openlab_ruby
+ pdf-reader
pg
prawn
prawn-table
@@ -520,4 +563,4 @@ DEPENDENCIES
webmock
BUNDLED WITH
- 1.12.5
+ 1.13.1
diff --git a/LICENSE.md b/LICENSE.md
index f2d5d21c0..3deb50991 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -14,39 +14,42 @@ 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 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.
+JS/EcmaScript libraries and in `Gemfile` for Ruby libraries.
+
-
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
@@ -666,4 +669,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/Procfile b/Procfile
index d6f589654..f8a9f7b3c 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,3 @@
web: bundle exec rails server puma -p $PORT -b0.0.0.0
worker: bundle exec sidekiq -C ./config/sidekiq.yml
+mail: bundle exec mailcatcher --foreground
diff --git a/README.md b/README.md
index 058494c52..a8fd03ba9 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
FabManager is the FabLab management solution. It is web-based, open-source and totally free.
-##### Table of Contents
+##### Table of Contents
1. [Software stack](#software-stack)
2. [Contributing](#contributing)
3. [Setup a production environment](#setup-a-production-environment)
@@ -122,9 +122,12 @@ In you only intend to run fab-manager on your local machine for testing purposes
```
8. Build the database. You may have to follow the steps described in [the PostgreSQL configuration chapter](#setup-fabmanager-in-postgresql) before, if you don't already had done it.
+ **Warning**: **NO NOT** run `rake db:setup` instead of these commands, as this will not run some required raw SQL instructions.
```bash
- rake db:setup
+ rake db:create
+ rake db:migrate
+ rake db:seed
```
9. Create the pids folder used by Sidekiq. If you want to use a different location, you can configure it in `config/sidekiq.yml`
@@ -145,6 +148,9 @@ In you only intend to run fab-manager on your local machine for testing purposes
- user: admin@fab-manager.com
- password: adminadmin
+13. Email notifications will be caught by MailCatcher.
+ To see the emails sent by the platform, open your web browser at `http://localhost:1080` to access the MailCatcher interface.
+
### Environment Configuration
@@ -159,7 +165,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
@@ -198,6 +204,12 @@ The PDF file name will be of the form "(INVOICE_PREFIX) - (invoice ID) _ (invoic
FABLAB_WITHOUT_PLANS
If set to 'true', the subscription plans will be fully disabled and invisible in the application.
+It is not recommended to disable plans if at least one subscription was took on the platform.
+
+ FABLAB_WITHOUT_SPACES
+
+If set to 'false', enable the spaces management and reservation in the application.
+It is not recommended to disable spaces if at least one space reservation was made on the system.
DEFAULT_MAIL_FROM
@@ -222,11 +234,12 @@ 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.
+This value can be graphically overridden during the application's lifecycle in Admin/Customization/Home page/Twitter Feed.
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
@@ -239,6 +252,35 @@ 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.
+
+ 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.
+
Settings related to i18n
See the [Settings](#i18n-settings) section of the [Internationalization (i18n)](#i18n) paragraph for a detailed description of these parameters.
@@ -295,7 +337,7 @@ Otherwise, please follow the official instructions on the project's website.
### Setup the FabManager database in PostgreSQL
-Before running `rake db:setup`, you have to make sure that the user configured in [config/database.yml](config/database.yml.default) for the `development` environment exists.
+Before running `rake db:create`, you have to make sure that the user configured in [config/database.yml](config/database.yml.default) for the `development` environment exists.
To create it, please follow these instructions:
1. Run the PostgreSQL administration command line interface, logged as the postgres user
@@ -325,20 +367,14 @@ To create it, please follow these instructions:
ALTER ROLE sleede WITH CREATEDB;
```
-4. Then, create the fabmanager_development and fabmanager_test databases
-
- ```sql
- CREATE DATABASE fabmanager_development OWNER sleede;
- CREATE DATABASE fabmanager_test OWNER sleede;
- ```
-
-5. To finish, attribute a password to this user
+4. Then, attribute a password to this user
```sql
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.
-
+
+5. 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
@@ -347,14 +383,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()`
@@ -363,8 +399,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
@@ -495,7 +531,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.
@@ -629,7 +665,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
@@ -648,17 +684,17 @@ Developers may find informations on how to implement their own authentication pr
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:
Error:
- ...
- ActiveRecord::InvalidForeignKey: PG::ForeignKeyViolation: ERROR: insert or update on table "..." violates foreign key constraint "fk_rails_..."
- DETAIL: Key (group_id)=(1) is not present in table "groups".
- : ...
- test_after_commit (1.0.0) lib/test_after_commit/database_statements.rb:11:in `block in transaction'
- test_after_commit (1.0.0) lib/test_after_commit/database_statements.rb:5:in `transaction'
+ ...
+ ActiveRecord::InvalidForeignKey: PG::ForeignKeyViolation: ERROR: insert or update on table "..." violates foreign key constraint "fk_rails_..."
+ DETAIL: Key (group_id)=(1) is not present in table "groups".
+ : ...
+ test_after_commit (1.0.0) lib/test_after_commit/database_statements.rb:11:in `block in transaction'
+ test_after_commit (1.0.0) lib/test_after_commit/database_statements.rb:5:in `transaction'
This is due to an ActiveRecord behavior witch disable referential integrity in PostgreSQL to load the fixtures.
PostgreSQL will prevent any users to disable referential integrity on the fly if they doesn't have the `SUPERUSER` role.
@@ -669,10 +705,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..7049d79b8 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;
@@ -80,6 +80,8 @@ config(['$httpProvider', 'AuthProvider', "growlProvider", "unsavedWarningsConfig
// Global config: if true, the whole 'Plans & Subscriptions' feature will be disabled in the application
$rootScope.fablabWithoutPlans = Fablab.withoutPlans;
+ // Global config: it true, the whole 'Spaces' features will be disabled in the application
+ $rootScope.fablabWithoutSpaces = Fablab.withoutSpaces;
// Global function to allow the user to navigate to the previous screen (ie. $state).
// If no previous $state were recorded, navigate to the home page
diff --git a/app/assets/javascripts/controllers/admin/calendar.coffee.erb b/app/assets/javascripts/controllers/admin/calendar.coffee.erb
index 85dd92c1f..33f9394ad 100644
--- a/app/assets/javascripts/controllers/admin/calendar.coffee.erb
+++ b/app/assets/javascripts/controllers/admin/calendar.coffee.erb
@@ -4,8 +4,8 @@
# Controller used in the calendar management page
##
-Application.Controllers.controller "AdminCalendarController", ["$scope", "$state", "$uibModal", "moment", "Availability", 'Slot', 'Setting', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', 'machinesPromise', '_t', 'uiCalendarConfig', 'CalendarConfig'
-($scope, $state, $uibModal, moment, Availability, Slot, Setting, growl, dialogs, bookingWindowStart, bookingWindowEnd, machinesPromise, _t, uiCalendarConfig, CalendarConfig) ->
+Application.Controllers.controller "AdminCalendarController", ["$scope", "$state", "$uibModal", "moment", "Availability", 'Slot', 'Setting', 'Export', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', 'machinesPromise', '_t', 'uiCalendarConfig', 'CalendarConfig'
+($scope, $state, $uibModal, moment, Availability, Slot, Setting, Export, growl, dialogs, bookingWindowStart, bookingWindowEnd, machinesPromise, _t, uiCalendarConfig, CalendarConfig) ->
@@ -50,6 +50,8 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
calendarEventClickCb(event, jsEvent, view)
eventRender: (event, element, view) ->
eventRenderCb(event, element)
+ loading: (isLoading, view ) ->
+ loadingCb(isLoading, view)
@@ -62,8 +64,8 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
dialogs.confirm
resolve:
object: ->
- title: _t('confirmation_required')
- msg: _t("do_you_really_want_to_cancel_the_USER_s_reservation_the_DATE_at_TIME_concerning_RESERVATION"
+ title: _t('admin_calendar.confirmation_required')
+ msg: _t("admin_calendar.do_you_really_want_to_cancel_the_USER_s_reservation_the_DATE_at_TIME_concerning_RESERVATION"
, { GENDER:getGender($scope.currentUser), USER:slot.user.name, DATE:moment(slot.start_at).format('L'), TIME:moment(slot.start_at).format('LT'), RESERVATION:slot.reservable.name }
, 'messageformat')
, ->
@@ -76,9 +78,9 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
resa.canceled_at = data.canceled_at
break
# notify the admin
- growl.success(_t('reservation_was_successfully_cancelled'))
+ growl.success(_t('admin_calendar.reservation_was_successfully_cancelled'))
, (data, status) -> # failed
- growl.error(_t('reservation_cancellation_failed'))
+ growl.error(_t('admin_calendar.reservation_cancellation_failed'))
@@ -89,16 +91,16 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
##
$scope.removeMachine = (machine) ->
if $scope.availability.machine_ids.length == 1
- growl.error(_t('unable_to_remove_the_last_machine_of_the_slot_delete_the_slot_rather'))
+ growl.error(_t('admin_calendar.unable_to_remove_the_last_machine_of_the_slot_delete_the_slot_rather'))
else
# open a confirmation dialog
dialogs.confirm
resolve:
object: ->
- title: _t('confirmation_required')
- msg: _t('do_you_really_want_to_remove_MACHINE_from_this_slot', {GENDER:getGender($scope.currentUser), MACHINE:machine.name}, "messageformat") + ' ' +
- _t('this_will_prevent_any_new_reservation_on_this_slot_but_wont_cancel_those_existing') + ' ' +
- _t('beware_this_cannot_be_reverted')
+ title: _t('admin_calendar.confirmation_required')
+ msg: _t('admin_calendar.do_you_really_want_to_remove_MACHINE_from_this_slot', {GENDER:getGender($scope.currentUser), MACHINE:machine.name}, "messageformat") + ' ' +
+ _t('admin_calendar.this_will_prevent_any_new_reservation_on_this_slot_but_wont_cancel_those_existing') + ' ' +
+ _t('admin_calendar.beware_this_cannot_be_reverted')
, ->
# the admin has confirmed, remove the machine
machines = $scope.availability.machine_ids
@@ -113,9 +115,20 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
$scope.availability.title = data.title
uiCalendarConfig.calendars.calendar.fullCalendar 'rerenderEvents'
# notify the admin
- growl.success(_t('the_machine_was_successfully_removed_from_the_slot'))
+ growl.success(_t('admin_calendar.the_machine_was_successfully_removed_from_the_slot'))
, (data, status) -> # failed
- growl.error(_t('deletion_failed'))
+ growl.error(_t('admin_calendar.deletion_failed'))
+
+
+
+ ##
+ # Callback to alert the admin that the export request was acknowledged and is
+ # processing right now.
+ ##
+ $scope.alertExport = (type) ->
+ Export.status({category: 'availabilities', type: type}).then (res) ->
+ unless (res.data.exists)
+ growl.success _t('admin_calendar.export_is_running_you_ll_be_notified_when_its_ready')
@@ -148,6 +161,15 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
resolve:
start: -> start
end: -> end
+ machinesPromise: ['Machine', (Machine)->
+ Machine.query().$promise
+ ]
+ trainingsPromise: ['Training', (Training)->
+ Training.query().$promise
+ ]
+ spacesPromise: ['Space', (Space)->
+ Space.query().$promise
+ ]
# when the modal is closed, we send the slot to the server for saving
modalInstance.result.then (availability) ->
uiCalendarConfig.calendars.calendar.fullCalendar 'renderEvent',
@@ -181,13 +203,10 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
if ($(jsEvent.target).hasClass('remove-event'))
Availability.delete id: event.id, ->
uiCalendarConfig.calendars.calendar.fullCalendar 'removeEvents', event.id
- for _event, i in $scope.eventSources[0].events
- if _event.id == event.id
- $scope.eventSources[0].events.splice(i,1)
- growl.success(_t('the_slot_START-END_has_been_successfully_deleted', {START:+moment(event.start).format('LL LT'), END:moment(event.end).format('LT')}))
+ growl.success(_t('admin_calendar.the_slot_START-END_has_been_successfully_deleted', {START:moment(event.start).format('LL LT'), END:moment(event.end).format('LT')}))
,->
- growl.error(_t('unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member', {START:+moment(event.start).format('LL LT'), END:moment(event.end).format('LT')}))
+ growl.error(_t('admin_calendar.unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member', {START:moment(event.start).format('LL LT'), END:moment(event.end).format('LT')}))
# if the user has only clicked on the event, display its reservations
else
Availability.reservations {id: event.id}, (reservations) ->
@@ -207,8 +226,20 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
for tag in event.tags
html += "#{tag.name} "
element.find('.fc-title').append(" "+html)
+ # force return to prevent coffee-script auto-return to return random value (possiblity falsy)
return
+
+
+ ##
+ # Triggered when resource fetching starts/stops.
+ # @see https://fullcalendar.io/docs/resource_data/loading/
+ ##
+ loadingCb = (isLoading, view) ->
+ if (isLoading)
+ # we remove existing events when fetching starts to prevent duplicates
+ uiCalendarConfig.calendars.calendar.fullCalendar('removeEvents')
+
]
@@ -216,7 +247,8 @@ Application.Controllers.controller "AdminCalendarController", ["$scope", "$state
##
# Controller used in the slot creation modal window
##
-Application.Controllers.controller 'CreateEventModalController', ["$scope", "$uibModalInstance", "moment", "start", "end", "Machine", "Availability", "Training", 'Tag', 'growl', '_t', ($scope, $uibModalInstance, moment, start, end, Machine, Availability, Training, Tag, growl, _t) ->
+Application.Controllers.controller 'CreateEventModalController', ["$scope", "$uibModalInstance", "moment", "start", "end", "machinesPromise", "Availability", "trainingsPromise", "spacesPromise", 'Tag', 'growl', '_t'
+, ($scope, $uibModalInstance, moment, start, end, machinesPromise, Availability, trainingsPromise, spacesPromise, Tag, growl, _t) ->
## $uibModal parameter
$scope.start = start
@@ -225,14 +257,26 @@ Application.Controllers.controller 'CreateEventModalController', ["$scope", "$ui
$scope.end = end
## machines list
- $scope.machines = []
+ $scope.machines = machinesPromise
## trainings list
- $scope.trainings = []
+ $scope.trainings = trainingsPromise
+
+ ## spaces list
+ $scope.spaces = spacesPromise
## machines associated with the created slot
$scope.selectedMachines = []
+ ## training associated with the created slot
+ $scope.selectedTraining = null
+
+ ## space associated with the created slot
+ $scope.selectedSpace = null
+
+ ## UI step
+ $scope.step = 1
+
## the user is not able to edit the ending time of the availability, unless he set the type to 'training'
$scope.endDateReadOnly = true
@@ -270,14 +314,16 @@ Application.Controllers.controller 'CreateEventModalController', ["$scope", "$ui
# Callback for the modal window validation: save the slot and closes the modal
##
$scope.ok = ->
- if $scope.availability.available_type == "machines"
+ if $scope.availability.available_type == 'machines'
if $scope.selectedMachines.length > 0
$scope.availability.machine_ids = $scope.selectedMachines.map (m) -> m.id
else
- growl.error(_t('you_should_link_a_training_or_a_machine_to_this_slot'))
+ growl.error(_t('admin_calendar.you_should_select_at_least_a_machine'))
return
- else
+ else if $scope.availability.available_type == 'training'
$scope.availability.training_ids = [$scope.selectedTraining.id]
+ else if $scope.availability.available_type == 'space'
+ $scope.availability.space_ids = [$scope.selectedSpace.id]
Availability.save
availability: $scope.availability
, (availability) ->
@@ -285,6 +331,23 @@ Application.Controllers.controller 'CreateEventModalController', ["$scope", "$ui
+ ##
+ # Move the modal UI to the next step
+ ##
+ $scope.next = ->
+ $scope.setNbTotalPlaces() if $scope.step == 1
+ $scope.step++
+
+
+
+ ##
+ # Move the modal UI to the next step
+ ##
+ $scope.previous = ->
+ $scope.step--
+
+
+
##
# Callback to cancel the slot creation
##
@@ -293,22 +356,14 @@ Application.Controllers.controller 'CreateEventModalController', ["$scope", "$ui
- ##
- # Switches the slot type : machine availability or training availability
- ##
- $scope.changeAvailableType = ->
- if $scope.availability.available_type == "machines"
- $scope.availability.available_type = "training"
- else
- $scope.availability.available_type = "machines"
-
-
-
##
# For training avaiabilities, set the maximum number of people allowed to register on this slot
##
$scope.setNbTotalPlaces = ->
- $scope.availability.nb_total_places = $scope.selectedTraining.nb_total_places
+ if $scope.availability.available_type == 'training'
+ $scope.availability.nb_total_places = $scope.selectedTraining.nb_total_places
+ else if $scope.availability.available_type == 'space'
+ $scope.availability.nb_total_places = $scope.selectedSpace.default_places
### PRIVATE SCOPE ###
@@ -317,18 +372,11 @@ Application.Controllers.controller 'CreateEventModalController', ["$scope", "$ui
# Kind of constructor: these actions will be realized first when the controller is loaded
##
initialize = ->
- Machine.query().$promise.then (data)->
- $scope.machines = data.map (d) ->
- id: d.id
- name: d.name
- Training.query().$promise.then (data)->
- $scope.trainings = data.map (d) ->
- id: d.id
- name: d.name
- nb_total_places: d.nb_total_places
- if $scope.trainings.length > 0
- $scope.selectedTraining = $scope.trainings[0]
- $scope.setNbTotalPlaces()
+ if $scope.trainings.length > 0
+ $scope.selectedTraining = $scope.trainings[0]
+ if $scope.spaces.length > 0
+ $scope.selectedSpace = $scope.spaces[0]
+
Tag.query().$promise.then (data) ->
$scope.tags = data
@@ -336,7 +384,7 @@ Application.Controllers.controller 'CreateEventModalController', ["$scope", "$ui
## time must be dividable by 60 minutes (base slot duration). For training availabilities, the user
## can configure any duration as it does not matters.
$scope.$watch 'availability.available_type', (newValue, oldValue, scope) ->
- if newValue == 'machines'
+ if newValue == 'machines' or newValue == 'space'
$scope.endDateReadOnly = true
diff = moment($scope.end).diff($scope.start, 'hours') # the result is rounded down by moment.js
$scope.end = moment($scope.start).add(diff, 'hours').toDate()
@@ -347,8 +395,8 @@ Application.Controllers.controller 'CreateEventModalController', ["$scope", "$ui
## When the start date is changed, if we are configuring a machine availability,
## maintain the relative length of the slot (ie. change the end time accordingly)
$scope.$watch 'start', (newValue, oldValue, scope) ->
- # for machine availabilities, adjust the end time
- if $scope.availability.available_type == 'machines'
+ # for machine or space availabilities, adjust the end time
+ if $scope.availability.available_type == 'machines' or $scope.availability.available_type == 'space'
end = moment($scope.end)
end.add(moment(newValue).diff(oldValue), 'milliseconds')
$scope.end = end.toDate()
diff --git a/app/assets/javascripts/controllers/admin/coupons.coffee b/app/assets/javascripts/controllers/admin/coupons.coffee
index eef8f658c..c62693e80 100644
--- a/app/assets/javascripts/controllers/admin/coupons.coffee
+++ b/app/assets/javascripts/controllers/admin/coupons.coffee
@@ -8,12 +8,13 @@ userValidities = ['once', 'forever']
##
# Controller used in the coupon creation page
##
-Application.Controllers.controller "NewCouponController", ["$scope", "$state",'Coupon', 'growl', '_t'
+Application.Controllers.controller "NewCouponController", ["$scope", "$state", 'Coupon', 'growl', '_t'
, ($scope, $state, Coupon, growl, _t) ->
## Values for the coupon currently created
$scope.coupon =
active: true
+ type: 'percent_off'
## Options for the validity per user
$scope.validities = userValidities
@@ -57,8 +58,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", 'Coupon', 'couponPromise', '_t', 'growl'
+, ($scope, $state, Coupon, couponPromise, _t, growl) ->
### PUBLIC SCOPE ###
@@ -72,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
@@ -97,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/javascripts/controllers/admin/events.coffee.erb b/app/assets/javascripts/controllers/admin/events.coffee.erb
index 4e2665f5d..728a58cbb 100644
--- a/app/assets/javascripts/controllers/admin/events.coffee.erb
+++ b/app/assets/javascripts/controllers/admin/events.coffee.erb
@@ -16,6 +16,8 @@
# - $scope.toggleStartDatePicker($event)
# - $scope.toggleEndDatePicker($event)
# - $scope.toggleRecurrenceEnd(e)
+# - $scope.addPrice()
+# - $scope.removePrice(price, $event)
#
# Requires :
# - $scope.event.event_files_attributes = []
@@ -137,6 +139,21 @@ class EventsController
+ ##
+ # Remove the price or mark it as 'to delete'
+ ##
+ $scope.removePrice = (price, event) ->
+ event.preventDefault()
+ event.stopPropagation()
+ if price.id
+ price._destroy = true
+ else
+ index = $scope.event.prices.indexOf(price)
+ $scope.event.prices.splice(index, 1)
+
+
+
+
##
# Controller used in the events listing page (admin view)
##
@@ -382,8 +399,8 @@ Application.Controllers.controller "ShowEventReservationsController", ["$scope",
##
# Controller used in the event creation page
##
-Application.Controllers.controller "NewEventController", ["$scope", "$state", "$locale", 'CSRF', 'categoriesPromise', 'themesPromise', 'ageRangesPromise', 'priceCategoriesPromise', '_t'
-, ($scope, $state, $locale, CSRF, categoriesPromise, themesPromise, ageRangesPromise, priceCategoriesPromise, _t) ->
+Application.Controllers.controller "NewEventController", ["$scope", "$state", 'CSRF', 'categoriesPromise', 'themesPromise', 'ageRangesPromise', 'priceCategoriesPromise', '_t'
+, ($scope, $state, CSRF, categoriesPromise, themesPromise, ageRangesPromise, priceCategoriesPromise, _t) ->
CSRF.setMetaTags()
## API URL where the form will be posted
@@ -425,10 +442,6 @@ Application.Controllers.controller "NewEventController", ["$scope", "$state", "$
{label: _t('every_year'), value: 'year'}
]
- ## currency symbol for the current locale (cf. angular-i18n)
- $scope.currencySymbol = $locale.NUMBER_FORMATS.CURRENCY_SYM;
-
-
## Using the EventsController
new EventsController($scope, $state)
]
@@ -438,8 +451,8 @@ Application.Controllers.controller "NewEventController", ["$scope", "$state", "$
##
# Controller used in the events edition page
##
-Application.Controllers.controller "EditEventController", ["$scope", "$state", "$stateParams", "$locale", 'CSRF', 'eventPromise', 'categoriesPromise', 'themesPromise', 'ageRangesPromise', 'priceCategoriesPromise'
-, ($scope, $state, $stateParams, $locale, CSRF, eventPromise, categoriesPromise, themesPromise, ageRangesPromise, priceCategoriesPromise) ->
+Application.Controllers.controller "EditEventController", ["$scope", "$state", "$stateParams", 'CSRF', 'eventPromise', 'categoriesPromise', 'themesPromise', 'ageRangesPromise', 'priceCategoriesPromise'
+, ($scope, $state, $stateParams, CSRF, eventPromise, categoriesPromise, themesPromise, ageRangesPromise, priceCategoriesPromise) ->
### PUBLIC SCOPE ###
@@ -454,9 +467,6 @@ Application.Controllers.controller "EditEventController", ["$scope", "$state", "
## Retrieve the event details, in case of error the user is redirected to the events listing
$scope.event = eventPromise
- ## currency symbol for the current locale (cf. angular-i18n)
- $scope.currencySymbol = $locale.NUMBER_FORMATS.CURRENCY_SYM;
-
## List of categories for the events
$scope.categories = categoriesPromise
diff --git a/app/assets/javascripts/controllers/admin/graphs.coffee b/app/assets/javascripts/controllers/admin/graphs.coffee
index 4e24d1318..6100e20e8 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
@@ -362,6 +362,10 @@ Application.Controllers.controller "GraphsController", ["$scope", "$state", "$ro
"index": "stats"
"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))
, (error, response) ->
if (error)
diff --git a/app/assets/javascripts/controllers/admin/invoices.coffee.erb b/app/assets/javascripts/controllers/admin/invoices.coffee.erb
index ba6dbdd13..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)
)
@@ -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
@@ -164,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)
)
@@ -335,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/admin/members.coffee.erb b/app/assets/javascripts/controllers/admin/members.coffee.erb
index 75b30126c..14b2c42a9 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)
@@ -421,16 +421,42 @@ Application.Controllers.controller "EditMemberController", ["$scope", "$state",
modalInstance = $uibModal.open
animation: true,
templateUrl: '<%= asset_path "wallet/credit_modal.html" %>'
- controller: ['$scope', '$uibModalInstance', 'Wallet', '$locale', ($scope, $uibModalInstance, Wallet, $locale) ->
+ controller: ['$scope', '$uibModalInstance', 'Wallet', ($scope, $uibModalInstance, Wallet) ->
- ## currency symbol for the current locale (cf. angular-i18n)
- $scope.currencySymbol = $locale.NUMBER_FORMATS.CURRENCY_SYM
+ # 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/javascripts/controllers/admin/plans.coffee.erb b/app/assets/javascripts/controllers/admin/plans.coffee.erb
index 8fb323c10..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', '$locale'
-, ($scope, $uibModal, groups, plans, machines, prices, partners, CSRF, $state, growl, _t, $locale) ->
+Application.Controllers.controller 'NewPlanController', ['$scope', '$uibModal', 'groups', 'prices', 'partners', 'CSRF', '$state', 'growl', '_t'
+, ($scope, $uibModal, groups, prices, partners, CSRF, $state, growl, _t) ->
@@ -119,10 +86,6 @@ Application.Controllers.controller 'NewPlanController', ['$scope', '$uibModal',
$scope.method = 'POST'
- ## currency symbol for the current locale (cf. angular-i18n)
- $scope.currencySymbol = $locale.NUMBER_FORMATS.CURRENCY_SYM;
-
-
##
# Checks if the partner contact is a valid data. Used in the form validation process
@@ -150,7 +113,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')
]
@@ -168,9 +131,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
@@ -179,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)
]
@@ -187,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', '$locale', 'Plan'
-, ($scope, groups, plans, planPromise, machines, prices, partners, CSRF, $state, $stateParams, growl, $filter, _t, $locale, 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'
@@ -208,10 +183,6 @@ Application.Controllers.controller 'EditPlanController', ['$scope', 'groups', 'p
$scope.method = 'PATCH'
- ## currency symbol for the current locale (cf. angular-i18n)
- $scope.currencySymbol = $locale.NUMBER_FORMATS.CURRENCY_SYM;
-
-
##
# If a parent plan was set ($scope.plan.parent), the prices will be copied from this parent plan into
@@ -239,9 +210,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('edit_plan.unable_to_save_subscription_changes_please_try_again'))
else
- growl.success(_t('subscription_successfully_changed'))
+ growl.success(_t('edit_plan.subscription_successfully_changed'))
$state.go('app.admin.pricing')
@@ -259,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 ###
##
@@ -266,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/controllers/admin/pricing.coffee.erb b/app/assets/javascripts/controllers/admin/pricing.coffee.erb
index 4d69bfae7..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', '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', '$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)
@@ -37,6 +37,15 @@ Application.Controllers.controller "EditPricingController", ["$scope", "$state",
## List of coupons
$scope.coupons = couponsPromise
+ ## 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
+
## The plans list ordering. Default: by group
$scope.orderPlans = 'group_id'
@@ -56,7 +65,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 +98,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 +119,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 +135,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 +152,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,11 +186,16 @@ 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
- 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
@@ -195,27 +209,27 @@ 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'))
##
# 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?
@@ -235,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')
@@ -242,8 +320,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 +348,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 +362,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 +402,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 +413,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 +441,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/javascripts/controllers/admin/settings.coffee b/app/assets/javascripts/controllers/admin/settings.coffee
index ea83a1525..1bb3ff416 100644
--- a/app/assets/javascripts/controllers/admin/settings.coffee
+++ b/app/assets/javascripts/controllers/admin/settings.coffee
@@ -45,6 +45,8 @@ Application.Controllers.controller "SettingsController", ["$scope", 'Setting', '
$scope.trainingExplicationsAlert = { name: 'training_explications_alert', value: settingsPromise.training_explications_alert }
$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 }
@@ -73,7 +75,7 @@ Application.Controllers.controller "SettingsController", ["$scope", 'Setting', '
$scope.cancelDelay =
name: 'booking_cancel_delay'
value: parseInt(settingsPromise.booking_cancel_delay)
-
+
$scope.enableReminder =
name: 'reminder_enable'
value: (settingsPromise.reminder_enable == 'true')
@@ -115,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)
@@ -134,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/controllers/admin/statistics.coffee.erb b/app/assets/javascripts/controllers/admin/statistics.coffee.erb
index 53d289217..834cae4db 100644
--- a/app/assets/javascripts/controllers/admin/statistics.coffee.erb
+++ b/app/assets/javascripts/controllers/admin/statistics.coffee.erb
@@ -144,7 +144,7 @@ Application.Controllers.controller "StatisticsController", ["$scope", "$state",
##
# Callback called when the active tab is changed.
# recover the current tab and store its value in $scope.selectedIndex
- # @param tab {Object} elasticsearch statistic structure
+ # @param tab {Object} elasticsearch statistic structure (from statistic_indices table)
##
$scope.setActiveTab = (tab) ->
$scope.selectedIndex = tab
@@ -160,6 +160,23 @@ Application.Controllers.controller "StatisticsController", ["$scope", "$state",
+ ##
+ # Returns true if the provided tab must be hidden due to some global or local configuration
+ # @param tab {Object} elasticsearch statistic structure (from statistic_indices table)
+ ##
+ $scope.hiddenTab = (tab) ->
+ if tab.table
+ if tab.es_type_key == 'subscription' && $rootScope.fablabWithoutPlans
+ true
+ else if tab.es_type_key == 'space' && $rootScope.fablabWithoutSpaces
+ true
+ else
+ false
+ else
+ true
+
+
+
##
# Callback to validate the filters and send a new request to elastic
##
@@ -380,6 +397,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 +445,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 +480,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/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
diff --git a/app/assets/javascripts/controllers/application.coffee.erb b/app/assets/javascripts/controllers/application.coffee.erb
index 043bfbab6..f08676e60 100644
--- a/app/assets/javascripts/controllers/application.coffee.erb
+++ b/app/assets/javascripts/controllers/application.coffee.erb
@@ -1,7 +1,7 @@
'use strict'
-Application.Controllers.controller 'ApplicationController', ["$rootScope", "$scope", "$window", "Session", "AuthService", "Auth", "$uibModal", "$state", 'growl', 'Notification', '$interval', "Setting", '_t', 'Version'
-, ($rootScope, $scope, $window, Session, AuthService, Auth, $uibModal, $state, growl, Notification, $interval, Setting, _t, Version) ->
+Application.Controllers.controller 'ApplicationController', ["$rootScope", "$scope", "$window", '$locale', "Session", "AuthService", "Auth", "$uibModal", "$state", 'growl', 'Notification', '$interval', "Setting", '_t', 'Version'
+, ($rootScope, $scope, $window, $locale, Session, AuthService, Auth, $uibModal, $state, growl, Notification, $interval, Setting, _t, Version) ->
@@ -18,19 +18,24 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
$scope.version =
version: ''
+ ## currency symbol for the current locale (cf. angular-i18n)
+ $rootScope.currencySymbol = $locale.NUMBER_FORMATS.CURRENCY_SYM;
+
+
##
# Set the current user to the provided value and initialize the session
# @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: ''}
##
@@ -55,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.
@@ -235,6 +242,10 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
# user is not logged in
openLoginModal(toState, toParams)
+ # we stop polling notifications when the page is not in foreground
+ onPageVisible (state) ->
+ $rootScope.toCheckNotifications = (state is 'visible')
+
Setting.get { name: 'fablab_name' }, (data)->
$scope.fablabName = data.setting.value
Setting.get { name: 'name_genre' }, (data)->
@@ -243,8 +254,9 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
# shorthands
- $scope.isAuthenticated = Auth.isAuthenticated;
- $scope.isAuthorized = AuthService.isAuthorized;
+ $scope.isAuthenticated = Auth.isAuthenticated
+ $scope.isAuthorized = AuthService.isAuthorized
+ $rootScope.login = $scope.login
@@ -255,29 +267,31 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
getNotifications = ->
$rootScope.toCheckNotifications = true
unless $rootScope.checkNotificationsIsInit or !$rootScope.currentUser
- $scope.notifications = Notification.query {is_read: false}
- $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
+ setTimeout ->
+ # we request the most recent notifications
+ Notification.last_unread (notifications) ->
+ $rootScope.lastCheck = new Date()
+ $scope.notifications = notifications.totals
- unless find
- diff.push(value)
+ 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 diff, (notification, key) ->
- growl.info(notification.message.description)
-
- , true
+ angular.forEach toDisplay, (notification) ->
+ growl.info(notification.message.description)
+ , 2000
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
@@ -361,6 +375,52 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
+ ##
+ # Detect if the current page (tab/window) is active of put as background.
+ # When the status changes, the callback is triggered with the new status as parameter
+ # Inspired by http://stackoverflow.com/questions/1060008/is-there-a-way-to-detect-if-a-browser-window-is-not-currently-active#answer-1060034
+ ##
+ onPageVisible = (callback) ->
+ hidden = 'hidden'
+
+ onchange = (evt) ->
+ v = 'visible'
+ h = 'hidden'
+ evtMap =
+ focus: v
+ focusin: v
+ pageshow: v
+ blur: h
+ focusout: h
+ pagehide: h
+ evt = evt or window.event
+ if evt.type of evtMap
+ if typeof callback == 'function' then callback(evtMap[evt.type])
+ else
+ if typeof callback == 'function' then callback(if @[hidden] then 'hidden' else 'visible')
+ return
+
+ # Standards:
+ if hidden of document
+ document.addEventListener 'visibilitychange', onchange
+ else if (hidden = 'mozHidden') of document
+ document.addEventListener 'mozvisibilitychange', onchange
+ else if (hidden = 'webkitHidden') of document
+ document.addEventListener 'webkitvisibilitychange', onchange
+ else if (hidden = 'msHidden') of document
+ document.addEventListener 'msvisibilitychange', onchange
+ # IE 9 and lower
+ else if 'onfocusin' of document
+ document.onfocusin = document.onfocusout = onchange
+ # All others
+ else
+ window.onpageshow = window.onpagehide = window.onfocus = window.onblur = onchange
+ # set the initial state (but only if browser supports the Page Visibility API)
+ if document[hidden] != undefined
+ onchange type: if document[hidden] then 'blur' else 'focus'
+
+
+
## !!! MUST BE CALLED AT THE END of the controller
initialize()
]
diff --git a/app/assets/javascripts/controllers/calendar.coffee b/app/assets/javascripts/controllers/calendar.coffee
index bb020c1ff..6b2e9e8b5 100644
--- a/app/assets/javascripts/controllers/calendar.coffee
+++ b/app/assets/javascripts/controllers/calendar.coffee
@@ -4,14 +4,15 @@
# Controller used in the public calendar global
##
-Application.Controllers.controller "CalendarController", ["$scope", "$state", "$aside", "moment", "Availability", 'Slot', 'Setting', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', '_t', 'uiCalendarConfig', 'CalendarConfig', 'trainingsPromise', 'machinesPromise',
-($scope, $state, $aside, moment, Availability, Slot, Setting, growl, dialogs, bookingWindowStart, bookingWindowEnd, _t, uiCalendarConfig, CalendarConfig, trainingsPromise, machinesPromise) ->
+Application.Controllers.controller "CalendarController", ["$scope", "$state", "$aside", "moment", "Availability", 'Slot', 'Setting', 'growl', 'dialogs', 'bookingWindowStart', 'bookingWindowEnd', '_t', 'uiCalendarConfig', 'CalendarConfig', 'trainingsPromise', 'machinesPromise', 'spacesPromise',
+($scope, $state, $aside, moment, Availability, Slot, Setting, growl, dialogs, bookingWindowStart, bookingWindowEnd, _t, uiCalendarConfig, CalendarConfig, trainingsPromise, machinesPromise, spacesPromise) ->
### PRIVATE STATIC CONSTANTS ###
currentMachineEvent = null
machinesPromise.forEach((m) -> m.checked = true)
trainingsPromise.forEach((t) -> t.checked = true)
+ spacesPromise.forEach((s) -> s.checked = true)
## check all formation/machine is select in filter
isSelectAll = (type, scope) ->
@@ -25,6 +26,9 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
## List of machines
$scope.machines = machinesPromise
+ ## List of spaces
+ $scope.spaces = spacesPromise
+
## add availabilities source to event sources
$scope.eventSources = []
@@ -34,6 +38,7 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
scope.filter = $scope.filter =
trainings: isSelectAll('trainings', scope)
machines: isSelectAll('machines', scope)
+ spaces: isSelectAll('spaces', scope)
evt: filter.evt
dispo: filter.dispo
$scope.calendarConfig.events = availabilitySourceUrl()
@@ -43,6 +48,7 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
$scope.filter =
trainings: isSelectAll('trainings', $scope)
machines: isSelectAll('machines', $scope)
+ spaces: isSelectAll('spaces', $scope)
evt: true
dispo: true
@@ -62,15 +68,18 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
$scope.trainings
machines: ->
$scope.machines
+ spaces: ->
+ $scope.spaces
filter: ->
$scope.filter
toggleFilter: ->
$scope.toggleFilter
filterAvailabilities: ->
$scope.filterAvailabilities
- controller: ['$scope', '$uibModalInstance', 'trainings', 'machines', 'filter', 'toggleFilter', 'filterAvailabilities', ($scope, $uibModalInstance, trainings, machines, filter, toggleFilter, filterAvailabilities) ->
+ controller: ['$scope', '$uibModalInstance', 'trainings', 'machines', 'spaces', 'filter', 'toggleFilter', 'filterAvailabilities', ($scope, $uibModalInstance, trainings, machines, spaces, filter, toggleFilter, filterAvailabilities) ->
$scope.trainings = trainings
$scope.machines = machines
+ $scope.spaces = spaces
$scope.filter = filter
$scope.toggleFilter = (type, filter) ->
@@ -94,13 +103,19 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
currentMachineEvent = event
calendar.fullCalendar('changeView', 'agendaDay')
calendar.fullCalendar('gotoDate', event.start)
+ else if event.available_type == 'space'
+ calendar.fullCalendar('changeView', 'agendaDay')
+ calendar.fullCalendar('gotoDate', event.start)
+ else if event.available_type == 'event'
+ $state.go('app.public.events_show', {id: event.event_id})
+ else if event.available_type == 'training'
+ $state.go('app.public.training_show', {id: event.training_id})
else
- if event.available_type == 'event'
- $state.go('app.public.events_show', {id: event.event_id})
- else if event.available_type == 'training'
- $state.go('app.public.training_show', {id: event.training_id})
- else
+ if event.machine_id
$state.go('app.public.machines_show', {id: event.machine_id})
+ else if event.space_id
+ $state.go('app.public.space_show', {id: event.space_id})
+
## agendaDay view: disable slotEventOverlap
## agendaWeek view: enable slotEventOverlap
@@ -109,10 +124,10 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
# ui-calendar will trigger rerender calendar
$scope.calendarConfig.defaultView = view.type
today = if currentMachineEvent then currentMachineEvent.start else moment().utc().startOf('day')
- if today > view.start and today < view.end and today != view.start
+ if today > view.intervalStart and today < view.intervalEnd and today != view.intervalStart
$scope.calendarConfig.defaultDate = today
else
- $scope.calendarConfig.defaultDate = view.start
+ $scope.calendarConfig.defaultDate = view.intervalStart
if view.type == 'agendaDay'
$scope.calendarConfig.slotEventOverlap = false
else
@@ -136,7 +151,8 @@ Application.Controllers.controller "CalendarController", ["$scope", "$state", "$
getFilter = ->
t = $scope.trainings.filter((t) -> t.checked).map((t) -> t.id)
m = $scope.machines.filter((m) -> m.checked).map((m) -> m.id)
- {t: t, m: m, evt: $scope.filter.evt, dispo: $scope.filter.dispo}
+ s = $scope.spaces.filter((s) -> s.checked).map((s) -> s.id)
+ {t: t, m: m, s: s, evt: $scope.filter.evt, dispo: $scope.filter.dispo}
availabilitySourceUrl = ->
"/api/availabilities/public?#{$.param(getFilter())}"
diff --git a/app/assets/javascripts/controllers/events.coffee.erb b/app/assets/javascripts/controllers/events.coffee.erb
index 39083272f..58ec0fe31 100644
--- a/app/assets/javascripts/controllers/events.coffee.erb
+++ b/app/assets/javascripts/controllers/events.coffee.erb
@@ -154,6 +154,7 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", "
tickets: {}
toReserve: false
amountTotal : 0
+ totalNoCoupon: 0
totalSeats: 0
## Discount coupon to apply to the basket, if any
@@ -172,6 +173,9 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", "
## Global config: delay in hours before a booking while changing the booking slot is forbidden
$scope.moveBookingDelay = parseInt(settingsPromise.booking_move_delay)
+ ## Message displayed to the end user about rules that applies to events reservations
+ $scope.eventExplicationsAlert = settingsPromise.event_explications_alert
+
##
@@ -400,6 +404,7 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", "
r = mkReservation($scope.ctrl.member, $scope.reserve, $scope.event)
Price.compute mkRequestParams(r, $scope.coupon.applied), (res) ->
$scope.reserve.amountTotal = res.price
+ $scope.reserve.totalNoCoupon = res.price_without_coupon
else
$scope.reserve.amountTotal = null
@@ -560,9 +565,9 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", "
member: $scope.ctrl.member
coupon: ->
$scope.coupon.applied
- controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'cgv', 'Auth', 'Reservation', 'growl', 'wallet', 'helpers', '$locale', '$filter', 'coupon',
- ($scope, $uibModalInstance, $state, reservation, price, cgv, Auth, Reservation, growl, wallet, helpers, $locale, $filter, coupon) ->
- # user wallet amount
+ controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'cgv', 'Auth', 'Reservation', 'growl', 'wallet', 'helpers', '$filter', 'coupon',
+ ($scope, $uibModalInstance, $state, reservation, price, cgv, Auth, Reservation, growl, wallet, helpers, $filter, coupon) ->
+ # User's wallet amount
$scope.walletAmount = wallet.amount
# Price
@@ -574,8 +579,7 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", "
# Reservation
$scope.reservation = reservation
- $scope.currencySymbol = $locale.NUMBER_FORMATS.CURRENCY_SYM
-
+ # Used in wallet info template to interpolate some translations
$scope.numberFilter = $filter('number')
# Callback for the stripe payment authorization
@@ -616,9 +620,9 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", "
Wallet.getWalletByUser({user_id: reservation.user_id}).$promise
coupon: ->
$scope.coupon.applied
- controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'Auth', 'Reservation', 'wallet', '$locale', 'helpers', '$filter', 'coupon',
- ($scope, $uibModalInstance, $state, reservation, price, Auth, Reservation, wallet, $locale, helpers, $filter, coupon) ->
- # user wallet amount
+ controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'Auth', 'Reservation', 'wallet', 'helpers', '$filter', 'coupon',
+ ($scope, $uibModalInstance, $state, reservation, price, Auth, Reservation, wallet, helpers, $filter, coupon) ->
+ # User's wallet amount
$scope.walletAmount = wallet.amount
# Price
@@ -630,8 +634,7 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", "
# Reservation
$scope.reservation = reservation
- $scope.currencySymbol = $locale.NUMBER_FORMATS.CURRENCY_SYM
-
+ # Used in wallet info template to interpolate some translations
$scope.numberFilter = $filter('number')
# Button label
@@ -675,6 +678,7 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", "
$scope.event.nb_free_places = $scope.event.nb_free_places - reservation.total_booked_seats
resetEventReserve()
$scope.reserveSuccess = true
+ $scope.coupon.applied = null
$scope.reservations.push reservation
if $scope.currentUser.role == 'admin'
$scope.ctrl.member = null
diff --git a/app/assets/javascripts/controllers/machines.coffee.erb b/app/assets/javascripts/controllers/machines.coffee.erb
index 12af6cb96..fd3d0ed5e 100644
--- a/app/assets/javascripts/controllers/machines.coffee.erb
+++ b/app/assets/javascripts/controllers/machines.coffee.erb
@@ -93,7 +93,7 @@ _reserveMachine = (machine, e) ->
# if the currently logged'in user has completed the training for this machine, or this machine does not require
# a prior training, just redirect him to the machine's booking page
if machine.current_user_is_training or machine.trainings.length == 0
- _this.$state.go('app.logged.machines_reserve', {id: machine.id})
+ _this.$state.go('app.logged.machines_reserve', {id: machine.slug})
else
# otherwise, if a user is authenticated ...
if _this.$scope.isAuthenticated()
@@ -231,10 +231,10 @@ 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
+ ## 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
##
@@ -268,20 +274,20 @@ Application.Controllers.controller "ShowMachineController", ['$scope', '$state',
# This controller workflow is pretty similar to the trainings reservation controller.
##
-Application.Controllers.controller "ReserveMachineController", ["$scope", "$state", '$stateParams', "$uibModal", '_t', "moment", 'Machine', 'Auth', 'dialogs', '$timeout', 'Price', 'Member', 'Availability', 'Slot', 'Setting', 'CustomAsset', 'plansPromise', 'groupsPromise', 'growl', 'machinePromise', 'settingsPromise', 'Wallet', 'helpers', 'uiCalendarConfig', 'CalendarConfig',
-($scope, $state, $stateParams, $uibModal, _t, moment, Machine, Auth, dialogs, $timeout, Price, Member, Availability, Slot, Setting, CustomAsset, plansPromise, groupsPromise, growl, machinePromise, settingsPromise, Wallet, helpers, uiCalendarConfig, CalendarConfig) ->
+Application.Controllers.controller "ReserveMachineController", ["$scope", '$stateParams', '_t', "moment", 'Auth', '$timeout', 'Member', 'Availability', 'plansPromise', 'groupsPromise', 'machinePromise', 'settingsPromise', 'uiCalendarConfig', 'CalendarConfig',
+($scope, $stateParams, _t, moment, Auth, $timeout, Member, Availability, plansPromise, groupsPromise, machinePromise, settingsPromise, uiCalendarConfig, CalendarConfig) ->
### PRIVATE STATIC CONSTANTS ###
- # Slot already booked by the current user
+ # Slot free to be booked
FREE_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::MACHINE_COLOR %>'
# Slot already booked by another user
UNAVAILABLE_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::MACHINE_IS_RESERVED_BY_USER %>'
- # Slot free to be booked
+ # Slot already booked by the current user
BOOKED_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::IS_RESERVED_BY_CURRENT_USER %>'
@@ -291,30 +297,31 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
## bind the machine availabilities with full-Calendar events
$scope.eventSources = []
- ## fullCalendar event. The last selected slot that the user want to book
- $scope.slotToPlace = null
-
- ## 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
$scope.selectedPlan = null
- ## array of fullCalendar events. Slots where the user want to book
- $scope.eventsReserved = []
+ ## the moment when the plan selection changed for the last time, used to trigger changes in the cart
+ $scope.planSelectionTime = null
- ## total amount of the bill to pay
- $scope.amountTotal = 0
+ ## mapping of fullCalendar events.
+ $scope.events =
+ reserved: [] # Slots that the user wants to book
+ modifiable: null # Slot that the user wants to change
+ placable: null # Destination slot for the change
+ paid: [] # Slots that were just booked by the user (transaction ok)
+ moved: null # Slots that were just moved by the user (change done) -> {newSlot:* oldSlot: *}
- ## Discount coupon to apply to the basket, if any
- $scope.coupon =
- applied: null
+ ## the moment when the slot selection changed for the last time, used to trigger changes in the cart
+ $scope.selectionTime = null
- ## is the user allowed to change the date of his booking
- $scope.enableBookingMove = true
+ ## the last clicked event in the calender
+ $scope.selectedEvent = null
+
+ ## the application global settings
+ $scope.settings = settingsPromise
## list of plans, classified by group
$scope.plansClassifiedByGroup = []
@@ -343,86 +350,87 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
## Global config: message to the end user concerning the subscriptions rules
$scope.subscriptionExplicationsAlert = settingsPromise.subscription_explications_alert
- ## Gloabl config: message to the end user concerning the machine bookings
+ ## Global config: message to the end user concerning the machine bookings
$scope.machineExplicationsAlert = settingsPromise.machine_explications_alert
- ## Global config: is the user authorized to change his bookings slots?
- $scope.enableBookingMove = (settingsPromise.booking_move_enable == "true")
- ## Global config: delay in hours before a booking while changing the booking slot is forbidden
- $scope.moveBookingDelay = parseInt(settingsPromise.booking_move_delay)
- ## Global config: is the user authorized to cancel his bookings?
- $scope.enableBookingCancel = (settingsPromise.booking_cancel_enable == "true")
-
- ## Global config: delay in hours before a booking while the cancellation is forbidden
- $scope.cancelBookingDelay = parseInt(settingsPromise.booking_cancel_delay)
+ ##
+ # Change the last selected slot's appearence to looks like 'added to cart'
+ ##
+ $scope.markSlotAsAdded = ->
+ $scope.selectedEvent.backgroundColor = FREE_SLOT_BORDER_COLOR
+ $scope.selectedEvent.title = _t('i_reserve')
+ updateCalendar()
##
- # Cancel the current booking modification, removing the previously booked slot from the selection
- # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
+ # Change the last selected slot's appearence to looks like 'never added to cart'
##
- $scope.removeSlotToModify = (e) ->
- e.preventDefault()
- if $scope.slotToPlace
- $scope.slotToPlace.backgroundColor = 'white'
- $scope.slotToPlace.title = ''
- $scope.slotToPlace = null
- $scope.slotToModify.title = if $scope.currentUser.role isnt 'admin' then _t('i_ve_reserved') else _t('not_available')
- $scope.slotToModify.backgroundColor = 'white'
- $scope.slotToModify = null
- uiCalendarConfig.calendars.calendar.fullCalendar 'rerenderEvents'
+ $scope.markSlotAsRemoved = (slot) ->
+ slot.backgroundColor = 'white'
+ slot.borderColor = FREE_SLOT_BORDER_COLOR
+ slot.title = ''
+ slot.isValid = false
+ slot.id = null
+ slot.is_reserved = false
+ slot.can_modify = false
+ slot.offered = false
+ updateCalendar()
##
- # When modifying an already booked reservation, cancel the choice of the new slot
- # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
+ # Callback when a slot was successfully cancelled. Reset the slot style as 'ready to book'
##
- $scope.removeSlotToPlace = (e)->
- e.preventDefault()
- $scope.slotToPlace.backgroundColor = 'white'
- $scope.slotToPlace.title = ''
- $scope.slotToPlace = null
- uiCalendarConfig.calendars.calendar.fullCalendar 'rerenderEvents'
+ $scope.slotCancelled = ->
+ $scope.markSlotAsRemoved($scope.selectedEvent)
##
- # When modifying an already booked reservation, confirm the modification.
+ # Change the last selected slot's appearence to looks like 'currently looking for a new destination to exchange'
+ ##
+ $scope.markSlotAsModifying = ->
+ $scope.selectedEvent.backgroundColor = '#eee'
+ $scope.selectedEvent.title = _t('i_change')
+ updateCalendar()
+
+
+
+ ##
+ # Change the last selected slot's appearence to looks like 'the slot being exchanged will take this place'
+ ##
+ $scope.changeModifyMachineSlot = ->
+ if $scope.events.placable
+ $scope.events.placable.backgroundColor = 'white'
+ $scope.events.placable.title = ''
+ if !$scope.events.placable or $scope.events.placable._id != $scope.selectedEvent._id
+ $scope.selectedEvent.backgroundColor = '#bbb'
+ $scope.selectedEvent.title = _t('i_shift')
+ updateCalendar()
+
+
+ ##
+ # When modifying an already booked reservation, callback when the modification was successfully done.
##
$scope.modifyMachineSlot = ->
- Slot.update {id: $scope.slotToModify.id},
- slot:
- start_at: $scope.slotToPlace.start
- end_at: $scope.slotToPlace.end
- availability_id: $scope.slotToPlace.availability_id
- , -> # success
- $scope.modifiedSlots =
- newReservedSlot: $scope.slotToPlace
- oldReservedSlot: $scope.slotToModify
- $scope.slotToPlace.title = if $scope.currentUser.role isnt 'admin' then _t('i_ve_reserved') else _t('not_available')
- $scope.slotToPlace.backgroundColor = 'white'
- $scope.slotToPlace.borderColor = $scope.slotToModify.borderColor
- $scope.slotToPlace.id = $scope.slotToModify.id
- $scope.slotToPlace.is_reserved = true
- $scope.slotToPlace.can_modify = true
- $scope.slotToPlace = null
+ $scope.events.placable.title = if $scope.currentUser.role isnt 'admin' then _t('i_ve_reserved') else _t('not_available')
+ $scope.events.placable.backgroundColor = 'white'
+ $scope.events.placable.borderColor = $scope.events.modifiable.borderColor
+ $scope.events.placable.id = $scope.events.modifiable.id
+ $scope.events.placable.is_reserved = true
+ $scope.events.placable.can_modify = true
- $scope.slotToModify.backgroundColor = 'white'
- $scope.slotToModify.title = ''
- $scope.slotToModify.borderColor = FREE_SLOT_BORDER_COLOR
- $scope.slotToModify.id = null
- $scope.slotToModify.is_reserved = false
- $scope.slotToModify.can_modify = false
- $scope.slotToModify = null
+ $scope.events.modifiable.backgroundColor = 'white'
+ $scope.events.modifiable.title = ''
+ $scope.events.modifiable.borderColor = FREE_SLOT_BORDER_COLOR
+ $scope.events.modifiable.id = null
+ $scope.events.modifiable.is_reserved = false
+ $scope.events.modifiable.can_modify = false
- uiCalendarConfig.calendars.calendar.fullCalendar 'rerenderEvents'
- , (err) -> # failure
- growl.error(_t('unable_to_change_the_reservation'))
- console.error(err)
+ updateCalendar()
@@ -430,14 +438,13 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
# Cancel the current booking modification, reseting the whole process
##
$scope.cancelModifyMachineSlot = ->
- $scope.slotToPlace.backgroundColor = 'white'
- $scope.slotToPlace.title = ''
- $scope.slotToPlace = null
- $scope.slotToModify.title = if $scope.currentUser.role isnt 'admin' then _t('i_ve_reserved') else _t('not_available')
- $scope.slotToModify.backgroundColor = 'white'
- $scope.slotToModify = null
+ if $scope.events.placable
+ $scope.events.placable.backgroundColor = 'white'
+ $scope.events.placable.title = ''
+ $scope.events.modifiable.title = if $scope.currentUser.role isnt 'admin' then _t('i_ve_reserved') else _t('not_available')
+ $scope.events.modifiable.backgroundColor = 'white'
- uiCalendarConfig.calendars.calendar.fullCalendar 'rerenderEvents'
+ updateCalendar()
@@ -446,67 +453,10 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
# reservations. (admins only)
##
$scope.updateMember = ->
- $scope.paidMachineSlots = null
$scope.plansAreShown = false
$scope.selectedPlan = null
Member.get {id: $scope.ctrl.member.id}, (member) ->
$scope.ctrl.member = member
- updateCartPrice()
-
-
-
- ##
- # Add the provided slot to the shopping cart (state transition from free to 'about to be reserved')
- # and increment the total amount of the cart if needed.
- # @param machineSlot {Object} fullCalendar event object
- ##
- $scope.validMachineSlot = (machineSlot)->
- machineSlot.isValid = true
- updateCartPrice()
-
-
-
- ##
- # Remove the provided slot from the shopping cart (state transition from 'about to be reserved' to free)
- # and decrement the total amount of the cart if needed.
- # @param machineSlot {Object} fullCalendar event object
- # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
- ##
- $scope.removeMachineSlot = (machineSlot, e)->
- e.preventDefault() if e
- machineSlot.backgroundColor = 'white'
- machineSlot.borderColor = FREE_SLOT_BORDER_COLOR
- machineSlot.title = ''
- machineSlot.isValid = false
-
- if machineSlot.machine.is_reduced_amount
- angular.forEach $scope.ctrl.member.machine_credits, (credit)->
- if credit.machine_id = machineSlot.machine.id
- credit.hours_used--
- machineSlot.machine.is_reduced_amount = false
-
- index = $scope.eventsReserved.indexOf(machineSlot)
- $scope.eventsReserved.splice(index, 1)
- if $scope.eventsReserved.length == 0
- if $scope.plansAreShown
- $scope.selectedPlan = null
- $scope.plansAreShown = false
- updateCartPrice()
- $timeout ->
- uiCalendarConfig.calendars.calendar.fullCalendar 'refetchEvents'
- uiCalendarConfig.calendars.calendar.fullCalendar 'rerenderEvents'
-
-
-
- ##
- # Checks that every selected slots were added to the shopping cart. Ie. will return false if
- # any checked slot was not validated by the user.
- ##
- $scope.machineSlotsValid = ->
- isValid = true
- angular.forEach $scope.eventsReserved, (m)->
- isValid = false if !m.isValid
- isValid
@@ -518,30 +468,10 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
e.preventDefault()
$scope.plansAreShown = false
$scope.selectPlan($scope.selectedPlan)
+ $scope.planSelectionTime = new Date()
- ##
- # Validates the shopping chart and redirect the user to the payment step
- ##
- $scope.payMachine = ->
-
- # first, we check that a user was selected
- if Object.keys($scope.ctrl.member).length > 0
- reservation = mkReservation($scope.ctrl.member, $scope.eventsReserved, $scope.selectedPlan)
-
- Wallet.getWalletByUser {user_id: $scope.ctrl.member.id}, (wallet) ->
- amountToPay = helpers.getAmountToPay($scope.amountTotal, wallet.amount)
- if $scope.currentUser.role isnt 'admin' and amountToPay > 0
- payByStripe(reservation)
- else
- if $scope.currentUser.role is 'admin' or amountToPay is 0
- payOnSite(reservation)
- else
- # otherwise we alert, this error musn't occur when the current user is not admin
- growl.error(_t('please_select_a_member_first'))
-
-
##
# Switch the user's view from the reservation agenda to the plan subscription
##
@@ -555,34 +485,41 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
# @param plan {Object} the plan to subscribe
##
$scope.selectPlan = (plan) ->
- if $scope.isAuthenticated()
- angular.forEach $scope.eventsReserved, (machineSlot)->
- angular.forEach $scope.ctrl.member.machine_credits, (credit)->
- if credit.machine_id = machineSlot.machine.id
- credit.hours_used = 0
- machineSlot.machine.is_reduced_amount = false
-
- if $scope.selectedPlan != plan
- $scope.selectedPlan = plan
- else
- $scope.selectedPlan = null
- updateCartPrice()
+ # toggle selected plan
+ if $scope.selectedPlan != plan
+ $scope.selectedPlan = plan
else
- $scope.login null, ->
- $scope.selectedPlan = plan
- updateCartPrice()
+ $scope.selectedPlan = null
+ $scope.planSelectionTime = new Date()
##
- # Checks if $scope.slotToModify and $scope.slotToPlace have tag incompatibilities
- # @returns {boolean} true in case of incompatibility
+ # Once the reservation is booked (payment process successfully completed), change the event style
+ # in fullCalendar, update the user's subscription and free-credits if needed
+ # @param reservation {Object}
##
- $scope.tagMissmatch = ->
- for tag in $scope.slotToModify.tags
- if tag.id not in $scope.slotToPlace.tag_ids
- return true
- false
+ $scope.afterPayment = (reservation)->
+ angular.forEach $scope.events.reserved, (machineSlot, key) ->
+ machineSlot.is_reserved = true
+ machineSlot.can_modify = true
+ if $scope.currentUser.role isnt 'admin'
+ machineSlot.title = _t('i_ve_reserved')
+ machineSlot.borderColor = BOOKED_SLOT_BORDER_COLOR
+ updateMachineSlot(machineSlot, reservation, $scope.currentUser)
+ else
+ machineSlot.title = _t('not_available')
+ machineSlot.borderColor = UNAVAILABLE_SLOT_BORDER_COLOR
+ updateMachineSlot(machineSlot, reservation, $scope.ctrl.member)
+ machineSlot.backgroundColor = 'white'
+
+ if $scope.selectedPlan
+ $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan)
+ Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan)
+ $scope.plansAreShown = false
+ $scope.selectedPlan = null
+
+ refetchCalendar()
@@ -600,74 +537,6 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
if $scope.currentUser.role isnt 'admin'
$scope.ctrl.member = $scope.currentUser
- # watch when a coupon is applied to re-compute the total price
- $scope.$watch 'coupon.applied', (newValue, oldValue) ->
- unless newValue == null and oldValue == null
- updateCartPrice()
-
-
-
- ##
- # Create an hash map implementing the Reservation specs
- # @param member {Object} User as retreived from the API: current user / selected user if current is admin
- # @param slots {Array