, , ...).
@@ -445,20 +445,20 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I
var parseHtml = function (html) {
return html.replace(/<\/?(\w+)((\s+\w+(\s*=\s*(?:".*?"|'.*?'|[^'">\s]+))?)+\s*|\s*)\/?>/g, function (match, p1, offset, string) {
if (['b', 'u', 'i', 'br'].includes(p1)) {
- return match
+ return match;
} else {
- return ''
+ return '';
}
- })
- }
+ });
+ };
/**
* Reinitialize the context of invoices' search to display new results set
*/
var resetSearchInvoice = function () {
- $scope.page = 1
- return $scope.noMoreResults = false
- }
+ $scope.page = 1;
+ return $scope.noMoreResults = false;
+ };
/**
* Run a search query with the current parameters set concerning invoices, then affect or concat the results
@@ -477,21 +477,21 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I
}
}, function (invoices) {
if (concat) {
- $scope.invoices = $scope.invoices.concat(invoices)
+ $scope.invoices = $scope.invoices.concat(invoices);
} else {
- $scope.invoices = invoices
+ $scope.invoices = invoices;
}
if (!invoices[0] || (invoices[0].maxInvoices <= $scope.invoices.length)) {
- return $scope.noMoreResults = true
+ return $scope.noMoreResults = true;
}
- })
- }
+ });
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
/**
* Controller used in the invoice refunding modal window
@@ -501,17 +501,17 @@ Application.Controllers.controller('AvoirModalController', ['$scope', '$uibModal
/* PUBLIC SCOPE */
// invoice linked to the current refund
- $scope.invoice = invoice
+ $scope.invoice = invoice;
// Associative array containing invoice_item ids associated with boolean values
- $scope.partial = {}
+ $scope.partial = {};
// Default refund parameters
$scope.avoir = {
invoice_id: invoice.id,
subscription_to_expire: false,
invoice_items_ids: []
- }
+ };
// Possible refunding methods
$scope.avoirModes = [
@@ -520,12 +520,12 @@ Application.Controllers.controller('AvoirModalController', ['$scope', '$uibModal
{ name: _t('by_cheque'), value: 'cheque' },
{ name: _t('by_transfer'), value: 'transfer' },
{ name: _t('by_wallet'), value: 'wallet' }
- ]
+ ];
// If a subscription was took with the current invoice, should it be canceled or not
- $scope.subscriptionExpireOptions = {}
- $scope.subscriptionExpireOptions[_t('yes')] = true
- $scope.subscriptionExpireOptions[_t('no')] = false
+ $scope.subscriptionExpireOptions = {};
+ $scope.subscriptionExpireOptions[_t('yes')] = true;
+ $scope.subscriptionExpireOptions[_t('no')] = false;
// AngularUI-Bootstrap datepicker parameters to define when to refund
$scope.datePicker = {
@@ -534,47 +534,47 @@ Application.Controllers.controller('AvoirModalController', ['$scope', '$uibModal
options: {
startingDay: Fablab.weekStartingDay
}
- }
+ };
/**
* Callback to open the datepicker
*/
$scope.openDatePicker = function ($event) {
- $event.preventDefault()
- $event.stopPropagation()
- return $scope.datePicker.opened = true
- }
+ $event.preventDefault();
+ $event.stopPropagation();
+ return $scope.datePicker.opened = true;
+ };
/**
* Validate the refunding and generate a refund invoice
*/
$scope.ok = function () {
// check that at least 1 element of the invoice is refunded
- $scope.avoir.invoice_items_ids = []
+ $scope.avoir.invoice_items_ids = [];
for (let itemId in $scope.partial) {
- const refundItem = $scope.partial[itemId]
- if (refundItem) { $scope.avoir.invoice_items_ids.push(parseInt(itemId)) }
+ const refundItem = $scope.partial[itemId];
+ if (refundItem) { $scope.avoir.invoice_items_ids.push(parseInt(itemId)); }
}
if ($scope.avoir.invoice_items_ids.length === 0) {
- return growl.error(_t('you_must_select_at_least_one_element_to_create_a_refund'))
+ return growl.error(_t('you_must_select_at_least_one_element_to_create_a_refund'));
} else {
return Invoice.save(
{ avoir: $scope.avoir },
function (avoir) { // success
- $uibModalInstance.close({ avoir, invoice: $scope.invoice })
+ $uibModalInstance.close({ avoir, invoice: $scope.invoice });
},
function (err) { // failed
- growl.error(_t('unable_to_create_the_refund'))
+ growl.error(_t('unable_to_create_the_refund'));
}
- )
+ );
}
- }
+ };
/**
* Cancel the refund, dismiss the modal window
*/
- $scope.cancel = function () { $uibModalInstance.dismiss('cancel') }
+ $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); };
/* PRIVATE SCOPE */
@@ -584,19 +584,19 @@ Application.Controllers.controller('AvoirModalController', ['$scope', '$uibModal
const initialize = function () {
// if the invoice was payed with stripe, allow to refund through stripe
Invoice.get({ id: invoice.id }, function (data) {
- $scope.invoice = data
+ $scope.invoice = data;
// default : all elements of the invoice are refund
return Array.from(data.items).map(function (item) {
- return ($scope.partial[item.id] = (typeof item.avoir_item_id !== 'number'))
- })
- })
+ return ($scope.partial[item.id] = (typeof item.avoir_item_id !== 'number'));
+ });
+ });
if (invoice.stripe) {
- return $scope.avoirModes.push({ name: _t('online_payment'), value: 'stripe' })
+ return $scope.avoirModes.push({ name: _t('online_payment'), value: 'stripe' });
}
- }
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/admin/members.js.erb b/app/assets/javascripts/controllers/admin/members.js.erb
index 5de4b1e89..3b4d5fd1a 100644
--- a/app/assets/javascripts/controllers/admin/members.js.erb
+++ b/app/assets/javascripts/controllers/admin/members.js.erb
@@ -13,7 +13,7 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
/* COMMON CODE */
@@ -38,7 +38,7 @@
class MembersController {
constructor ($scope, $state, Group, Training) {
// Retrieve the profiles groups (eg. students ...)
- Group.query(function (groups) { $scope.groups = groups.filter(function (g) { return (g.slug !== 'admins') && !g.disabled }) })
+ Group.query(function (groups) { $scope.groups = groups.filter(function (g) { return (g.slug !== 'admins') && !g.disabled; }); });
// Retrieve the list of available trainings
Training.query().$promise.then(function (data) {
@@ -47,9 +47,9 @@ class MembersController {
id: d.id,
name: d.name,
disabled: d.disabled
- })
- })
- })
+ });
+ });
+ });
// Default parameters for AngularUI-Bootstrap datepicker
$scope.datePicker = {
@@ -59,27 +59,27 @@ class MembersController {
options: {
startingDay: Fablab.weekStartingDay
}
- }
+ };
/**
* Shows the birth day datepicker
* @param $event {Object} jQuery event object
*/
$scope.openDatePicker = function ($event) {
- $event.preventDefault()
- $event.stopPropagation()
- return $scope.datePicker.opened = true
- }
+ $event.preventDefault();
+ $event.stopPropagation();
+ return $scope.datePicker.opened = true;
+ };
/**
* Shows the end of subscription datepicker
* @param $event {Object} jQuery event object
*/
$scope.openSubscriptionDatePicker = function ($event) {
- $event.preventDefault()
- $event.stopPropagation()
- return $scope.datePicker.subscription_date_opened = true
- }
+ $event.preventDefault();
+ $event.stopPropagation();
+ return $scope.datePicker.subscription_date_opened = true;
+ };
/**
* For use with ngUpload (https://github.com/twilson63/ngUpload).
@@ -89,24 +89,24 @@ class MembersController {
*/
$scope.submited = function (content) {
if ((content.id == null)) {
- $scope.alerts = []
+ $scope.alerts = [];
return angular.forEach(content, function (v, k) {
angular.forEach(v, function (err) {
$scope.alerts.push({
msg: k + ': ' + err,
type: 'danger'
- })
- })
- })
+ });
+ });
+ });
} else {
- return $state.go('app.admin.members')
+ return $state.go('app.admin.members');
}
- }
+ };
/**
* Changes the admin's view to the members list page
*/
- $scope.cancel = function () { $state.go('app.admin.members') }
+ $scope.cancel = function () { $state.go('app.admin.members'); };
/**
* For use with 'ng-class', returns the CSS class name for the uploads previews.
@@ -115,11 +115,11 @@ class MembersController {
*/
$scope.fileinputClass = function (v) {
if (v) {
- return 'fileinput-exists'
+ return 'fileinput-exists';
} else {
- return 'fileinput-new'
+ return 'fileinput-new';
}
- }
+ };
}
}
@@ -131,12 +131,12 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
/* PRIVATE STATIC CONSTANTS */
// number of users loaded each time we click on 'load more...'
- const USERS_PER_PAGE = 20
+ const USERS_PER_PAGE = 20;
/* PUBLIC SCOPE */
// members list
- $scope.members = membersPromise
+ $scope.members = membersPromise;
$scope.member = {
// Members plain-text filtering. Default: not filtered
@@ -147,13 +147,13 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
page: 1,
// true when all members where loaded
noMore: false
- }
+ };
// admins list
- $scope.admins = adminsPromise.admins
+ $scope.admins = adminsPromise.admins;
// Admins ordering/sorting. Default: not sorted
- $scope.orderAdmin = null
+ $scope.orderAdmin = null;
/**
* Change the members ordering criterion to the one provided
@@ -161,14 +161,14 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
*/
$scope.setOrderMember = function (orderBy) {
if ($scope.member.order === orderBy) {
- $scope.member.order = `-${orderBy}`
+ $scope.member.order = `-${orderBy}`;
} else {
- $scope.member.order = orderBy
+ $scope.member.order = orderBy;
}
- resetSearchMember()
- return memberSearch()
- }
+ resetSearchMember();
+ return memberSearch();
+ };
/**
* Change the admins ordering criterion to the one provided
@@ -176,11 +176,11 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
*/
$scope.setOrderAdmin = function (orderAdmin) {
if ($scope.orderAdmin === orderAdmin) {
- return $scope.orderAdmin = `-${orderAdmin}`
+ return $scope.orderAdmin = `-${orderAdmin}`;
} else {
- return $scope.orderAdmin = orderAdmin
+ return $scope.orderAdmin = orderAdmin;
}
- }
+ };
/**
* Ask for confirmation then delete the specified administrator
@@ -195,7 +195,7 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
return {
title: _t('confirmation_required'),
msg: $sce.trustAsHtml(_t('do_you_really_want_to_delete_this_administrator_this_cannot_be_undone') + '
' + _t('this_may_take_a_while_please_wait'))
- }
+ };
}
}
},
@@ -203,31 +203,31 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
Admin.delete(
{ id: admin.id },
function () {
- admins.splice(findAdminIdxById(admins, admin.id), 1)
- return growl.success(_t('administrator_successfully_deleted'))
+ admins.splice(findAdminIdxById(admins, admin.id), 1);
+ return growl.success(_t('administrator_successfully_deleted'));
},
- function (error) { growl.error(_t('unable_to_delete_the_administrator')) }
- )
+ function (error) { growl.error(_t('unable_to_delete_the_administrator')); }
+ );
}
- )
- }
+ );
+ };
/**
* Callback for the 'load more' button.
* Will load the next results of the current search, if any
*/
$scope.showNextMembers = function () {
- $scope.member.page += 1
- return memberSearch(true)
- }
+ $scope.member.page += 1;
+ return memberSearch(true);
+ };
/**
* Callback when the search field content changes: reload the search results
*/
$scope.updateTextSearch = function () {
- resetSearchMember()
- return memberSearch()
- }
+ resetSearchMember();
+ return memberSearch();
+ };
/**
* Callback to alert the admin that the export request was acknowledged and is
@@ -236,10 +236,10 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
$scope.alertExport = function (type) {
Export.status({ category: 'users', type }).then(function (res) {
if (!res.data.exists) {
- return growl.success(_t('export_is_running_you_ll_be_notified_when_its_ready'))
+ return growl.success(_t('export_is_running_you_ll_be_notified_when_its_ready'));
}
- })
- }
+ });
+ };
/* PRIVATE SCOPE */
@@ -248,9 +248,9 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
*/
const initialize = function () {
if (!membersPromise[0] || (membersPromise[0].maxMembers <= $scope.members.length)) {
- return $scope.member.noMore = true
+ return $scope.member.noMore = true;
}
- }
+ };
/**
* Iterate through the provided array and return the index of the requested admin
@@ -259,16 +259,16 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
* @returns {Number} index of the requested admin, in the provided array
*/
var findAdminIdxById = function (admins, id) {
- return (admins.map(function (admin) { return admin.id })).indexOf(id)
- }
+ return (admins.map(function (admin) { return admin.id; })).indexOf(id);
+ };
/**
* Reinitialize the context of members's search to display new results set
*/
var resetSearchMember = function () {
- $scope.member.noMore = false
- return $scope.member.page = 1
- }
+ $scope.member.noMore = false;
+ return $scope.member.page = 1;
+ };
/**
* Run a search query with the current parameters set ($scope.member[searchText,order,page])
@@ -285,21 +285,21 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
}
}, function (members) {
if (concat) {
- $scope.members = $scope.members.concat(members)
+ $scope.members = $scope.members.concat(members);
} else {
- $scope.members = members
+ $scope.members = members;
}
if (!members[0] || (members[0].maxMembers <= $scope.members.length)) {
- return $scope.member.noMore = true
+ return $scope.member.noMore = true;
}
- })
- }
+ });
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
/**
* Controller used in the member edition page
@@ -309,51 +309,51 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
/* PUBLIC SCOPE */
// API URL where the form will be posted
- $scope.actionUrl = `/api/members/${$stateParams.id}`
+ $scope.actionUrl = `/api/members/${$stateParams.id}`;
// Form action on the above URL
- $scope.method = 'patch'
+ $scope.method = 'patch';
// List of tags associables with user
- $scope.tags = tagsPromise
+ $scope.tags = tagsPromise;
// The user to edit
- $scope.user = memberPromise
+ $scope.user = memberPromise;
// Should the passord be modified?
$scope.password =
- { change: false }
+ { change: false };
// the user subscription
if (($scope.user.subscribed_plan != null) && ($scope.user.subscription != null)) {
- $scope.subscription = $scope.user.subscription
- $scope.subscription.expired_at = $scope.subscription.expired_at
+ $scope.subscription = $scope.user.subscription;
+ $scope.subscription.expired_at = $scope.subscription.expired_at;
} else {
Plan.query({ group_id: $scope.user.group_id }, function (plans) {
- $scope.plans = plans
+ $scope.plans = plans;
return Array.from($scope.plans).map(function (plan) {
- return (plan.nameToDisplay = $filter('humanReadablePlanName')(plan))
- })
- })
+ return (plan.nameToDisplay = $filter('humanReadablePlanName')(plan));
+ });
+ });
}
// Available trainings list
- $scope.trainings = []
+ $scope.trainings = [];
// Profiles types (student/standard/...)
- $scope.groups = []
+ $scope.groups = [];
// the user wallet
- $scope.wallet = walletPromise
+ $scope.wallet = walletPromise;
// user wallet transactions
- $scope.transactions = transactionsPromise
+ $scope.transactions = transactionsPromise;
// used in wallet partial template to identify parent view
- $scope.view = 'member_edit'
+ $scope.view = 'member_edit';
// current active authentication provider
- $scope.activeProvider = activeProviderPromise
+ $scope.activeProvider = activeProviderPromise;
/**
* Open a modal dialog, allowing the admin to extend the current user's subscription (freely or not)
@@ -366,8 +366,8 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
templateUrl: '<%= asset_path "admin/subscriptions/expired_at_modal.html" %>',
size: 'lg',
controller: ['$scope', '$uibModalInstance', 'Subscription', function ($scope, $uibModalInstance, Subscription) {
- $scope.new_expired_at = angular.copy(subscription.expired_at)
- $scope.free = free
+ $scope.new_expired_at = angular.copy(subscription.expired_at);
+ $scope.free = free;
$scope.datePicker = {
opened: false,
format: Fablab.uibDateFormat,
@@ -375,32 +375,32 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
startingDay: Fablab.weekStartingDay
},
minDate: new Date()
- }
+ };
$scope.openDatePicker = function (ev) {
- ev.preventDefault()
- ev.stopPropagation()
- return $scope.datePicker.opened = true
- }
+ ev.preventDefault();
+ ev.stopPropagation();
+ return $scope.datePicker.opened = true;
+ };
$scope.ok = function () {
Subscription.update(
{ id: subscription.id },
{ subscription: { expired_at: $scope.new_expired_at, free } },
function (_subscription) {
- growl.success(_t('you_successfully_changed_the_expiration_date_of_the_user_s_subscription'))
- return $uibModalInstance.close(_subscription)
+ growl.success(_t('you_successfully_changed_the_expiration_date_of_the_user_s_subscription'));
+ return $uibModalInstance.close(_subscription);
},
- function (error) { growl.error(_t('a_problem_occurred_while_saving_the_date')) }
- )
- }
+ function (error) { growl.error(_t('a_problem_occurred_while_saving_the_date')); }
+ );
+ };
- $scope.cancel = function () { $uibModalInstance.dismiss('cancel') }
+ $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); };
}]
- })
+ });
// once the form was validated successfully ...
- return modalInstance.result.then(function (subscription) { $scope.subscription.expired_at = subscription.expired_at })
- }
+ return modalInstance.result.then(function (subscription) { $scope.subscription.expired_at = subscription.expired_at; });
+ };
/**
* Open a modal dialog allowing the admin to set a subscription for the given user.
@@ -414,10 +414,10 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
size: 'lg',
controller: ['$scope', '$uibModalInstance', 'Subscription', 'Group', function ($scope, $uibModalInstance, Subscription, Group) {
// selected user
- $scope.user = user
+ $scope.user = user;
// available plans for the selected user
- $scope.plans = plans
+ $scope.plans = plans;
/**
* Generate a string identifying the given plan by literal human-readable name
@@ -427,33 +427,33 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
* will be included.
* @returns {String}
*/
- $scope.humanReadablePlanName = function (plan, groups, short) { return `${$filter('humanReadablePlanName')(plan, groups, short)}` }
+ $scope.humanReadablePlanName = function (plan, groups, short) { return `${$filter('humanReadablePlanName')(plan, groups, short)}`; };
/**
* Modal dialog validation callback
*/
$scope.ok = function () {
- $scope.subscription.user_id = user.id
+ $scope.subscription.user_id = user.id;
return Subscription.save({ }, { subscription: $scope.subscription }, function (_subscription) {
- growl.success(_t('subscription_successfully_purchased'))
- $uibModalInstance.close(_subscription)
- return $state.reload()
+ growl.success(_t('subscription_successfully_purchased'));
+ $uibModalInstance.close(_subscription);
+ return $state.reload();
}
, function (error) {
- growl.error(_t('a_problem_occurred_while_taking_the_subscription'))
- console.error(error)
- })
- }
+ growl.error(_t('a_problem_occurred_while_taking_the_subscription'));
+ console.error(error);
+ });
+ };
/**
* Modal dialog cancellation callback
*/
- $scope.cancel = function () { $uibModalInstance.dismiss('cancel') }
+ $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); };
}]
- })
+ });
// once the form was validated succesfully ...
- return modalInstance.result.then(function (subscription) { $scope.subscription = subscription })
- }
+ return modalInstance.result.then(function (subscription) { $scope.subscription = subscription; });
+ };
$scope.createWalletCreditModal = function (user, wallet) {
const modalInstance = $uibModal.open({
@@ -461,13 +461,13 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
templateUrl: '<%= asset_path "wallet/credit_modal.html" %>',
controller: ['$scope', '$uibModalInstance', 'Wallet', function ($scope, $uibModalInstance, Wallet) {
// default: do not generate a refund invoice
- $scope.generate_avoir = false
+ $scope.generate_avoir = false;
// date of the generated refund invoice
- $scope.avoir_date = null
+ $scope.avoir_date = null;
// optional description shown on the refund invoice
- $scope.description = ''
+ $scope.description = '';
// default configuration for the avoir date selector widget
$scope.datePicker = {
@@ -476,16 +476,16 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
options: {
startingDay: Fablab.weekStartingDay
}
- }
+ };
/**
* Callback to open/close the date picker
*/
$scope.toggleDatePicker = function ($event) {
- $event.preventDefault()
- $event.stopPropagation()
- return $scope.datePicker.opened = !$scope.datePicker.opened
- }
+ $event.preventDefault();
+ $event.stopPropagation();
+ return $scope.datePicker.opened = !$scope.datePicker.opened;
+ };
/**
* Modal dialog validation callback
@@ -500,33 +500,33 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
avoir_description: $scope.description
},
function (_wallet) {
- growl.success(_t('wallet_credit_successfully'))
- return $uibModalInstance.close(_wallet)
+ growl.success(_t('wallet_credit_successfully'));
+ return $uibModalInstance.close(_wallet);
},
function (error) {
- growl.error(_t('a_problem_occurred_for_wallet_credit'))
- console.error(error)
+ growl.error(_t('a_problem_occurred_for_wallet_credit'));
+ console.error(error);
}
- )
- }
+ );
+ };
/**
* Modal dialog cancellation callback
*/
- $scope.cancel = function () { $uibModalInstance.dismiss('cancel') }
+ $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); };
}
- ] })
+ ] });
// once the form was validated succesfully ...
return modalInstance.result.then(function (wallet) {
- $scope.wallet = wallet
- return Wallet.transactions({ id: wallet.id }, function (transactions) { $scope.transactions = transactions })
- })
- }
+ $scope.wallet = wallet;
+ return Wallet.transactions({ id: wallet.id }, function (transactions) { $scope.transactions = transactions; });
+ });
+ };
/**
* To use as callback in Array.prototype.filter to get only enabled plans
*/
- $scope.filterDisabledPlans = function (plan) { return !plan.disabled }
+ $scope.filterDisabledPlans = function (plan) { return !plan.disabled; };
/* PRIVATE SCOPE */
@@ -534,83 +534,83 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state',
* Kind of constructor: these actions will be realized first when the controller is loaded
*/
const initialize = function () {
- CSRF.setMetaTags()
+ CSRF.setMetaTags();
// init the birth date to JS object
- $scope.user.profile.birthday = moment($scope.user.profile.birthday).toDate()
+ $scope.user.profile.birthday = moment($scope.user.profile.birthday).toDate();
// the user subscription
if (($scope.user.subscribed_plan != null) && ($scope.user.subscription != null)) {
- $scope.subscription = $scope.user.subscription
- $scope.subscription.expired_at = $scope.subscription.expired_at
+ $scope.subscription = $scope.user.subscription;
+ $scope.subscription.expired_at = $scope.subscription.expired_at;
} else {
Plan.query({ group_id: $scope.user.group_id }, function (plans) {
- $scope.plans = plans
+ $scope.plans = plans;
return Array.from($scope.plans).map(function (plan) {
- return (plan.nameToDisplay = `${plan.base_name} - ${plan.interval}`)
- })
- })
+ return (plan.nameToDisplay = `${plan.base_name} - ${plan.interval}`);
+ });
+ });
}
// Using the MembersController
- return new MembersController($scope, $state, Group, Training)
- }
+ return new MembersController($scope, $state, Group, Training);
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
/**
* Controller used in the member's creation page (admin view)
*/
Application.Controllers.controller('NewMemberController', ['$scope', '$state', '$stateParams', 'Member', 'Training', 'Group', 'CSRF',
function ($scope, $state, $stateParams, Member, Training, Group, CSRF) {
- CSRF.setMetaTags()
+ CSRF.setMetaTags();
/* PUBLIC SCOPE */
// API URL where the form will be posted
- $scope.actionUrl = '/api/members'
+ $scope.actionUrl = '/api/members';
// Form action on the above URL
- $scope.method = 'post'
+ $scope.method = 'post';
// Should the passord be set manually or generated?
$scope.password =
- { change: false }
+ { change: false };
// Default member's profile parameters
$scope.user =
- { plan_interval: '' }
+ { plan_interval: '' };
// Callback when the admin check/unckeck the box telling that the new user is an organization.
// Disable or enable the organization fields in the form, accordingly
$scope.toggleOrganization = function () {
if ($scope.user.organization) {
- if (!$scope.user.profile) { $scope.user.profile = {} }
- return $scope.user.profile.organization = {}
+ if (!$scope.user.profile) { $scope.user.profile = {}; }
+ return $scope.user.profile.organization = {};
} else {
- return $scope.user.profile.organization = undefined
+ return $scope.user.profile.organization = undefined;
}
- }
+ };
// Using the MembersController
- return new MembersController($scope, $state, Group, Training)
+ return new MembersController($scope, $state, Group, Training);
}
-])
+]);
/**
* Controller used in the admin's creation page (admin view)
*/
Application.Controllers.controller('NewAdminController', ['$state', '$scope', 'Admin', 'growl', '_t', function ($state, $scope, Admin, growl, _t) {
// default admin profile
- let getGender
+ let getGender;
$scope.admin = {
profile_attributes: {
gender: true
}
- }
+ };
// Default parameters for AngularUI-Bootstrap datepicker
$scope.datePicker = {
@@ -619,13 +619,13 @@ Application.Controllers.controller('NewAdminController', ['$state', '$scope', 'A
options: {
startingDay: Fablab.weekStartingDay
}
- }
+ };
/**
* Shows the birth day datepicker
* @param $event {Object} jQuery event object
*/
- $scope.openDatePicker = function ($event) { $scope.datePicker.opened = true }
+ $scope.openDatePicker = function ($event) { $scope.datePicker.opened = true; };
/**
* Send the new admin, currently stored in $scope.admin, to the server for database saving
@@ -635,14 +635,14 @@ Application.Controllers.controller('NewAdminController', ['$state', '$scope', 'A
{},
{ admin: $scope.admin },
function () {
- growl.success(_t('administrator_successfully_created_he_will_receive_his_connection_directives_by_email', { GENDER: getGender($scope.admin) }, 'messageformat'))
- return $state.go('app.admin.members')
+ growl.success(_t('administrator_successfully_created_he_will_receive_his_connection_directives_by_email', { GENDER: getGender($scope.admin) }, 'messageformat'));
+ return $state.go('app.admin.members');
}
, function (error) {
- console.log(error)
+ console.log(error);
}
- )
- }
+ );
+ };
/* PRIVATE SCOPE */
@@ -653,9 +653,9 @@ Application.Controllers.controller('NewAdminController', ['$state', '$scope', 'A
*/
return getGender = function (user) {
if (user.profile_attributes) {
- if (user.profile_attributes.gender) { return 'male' } else { return 'female' }
- } else { return 'other' }
- }
+ if (user.profile_attributes.gender) { return 'male'; } else { return 'female'; }
+ } else { return 'other'; }
+ };
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/admin/open_api_clients.js b/app/assets/javascripts/controllers/admin/open_api_clients.js
index fc9c66055..3ded18d15 100644
--- a/app/assets/javascripts/controllers/admin/open_api_clients.js
+++ b/app/assets/javascripts/controllers/admin/open_api_clients.js
@@ -15,46 +15,46 @@ Application.Controllers.controller('OpenAPIClientsController', ['$scope', 'clien
/* PUBLIC SCOPE */
// clients list
- $scope.clients = clientsPromise
- $scope.order = null
- $scope.clientFormVisible = false
- $scope.client = {}
+ $scope.clients = clientsPromise;
+ $scope.order = null;
+ $scope.clientFormVisible = false;
+ $scope.client = {};
- $scope.toggleForm = () => $scope.clientFormVisible = !$scope.clientFormVisible
+ $scope.toggleForm = () => $scope.clientFormVisible = !$scope.clientFormVisible;
// Change the order criterion to the one provided
// @param orderBy {string} ordering criterion
//
$scope.setOrder = function (orderBy) {
if ($scope.order === orderBy) {
- return $scope.order = `-${orderBy}`
+ return $scope.order = `-${orderBy}`;
} else {
- return $scope.order = orderBy
+ return $scope.order = orderBy;
}
- }
+ };
$scope.saveClient = function (client) {
if (client.id != null) {
OpenAPIClient.update({ id: client.id }, { open_api_client: client }, function (clientResp) {
- client = clientResp
- return growl.success(_t('client_successfully_updated'))
- })
+ client = clientResp;
+ return growl.success(_t('client_successfully_updated'));
+ });
} else {
OpenAPIClient.save({ open_api_client: client }, function (client) {
- $scope.clients.push(client)
- return growl.success(_t('client_successfully_created'))
- })
+ $scope.clients.push(client);
+ return growl.success(_t('client_successfully_created'));
+ });
}
- $scope.clientFormVisible = false
- $scope.clientForm.$setPristine()
- return $scope.client = {}
- }
+ $scope.clientFormVisible = false;
+ $scope.clientForm.$setPristine();
+ return $scope.client = {};
+ };
$scope.editClient = function (client) {
- $scope.clientFormVisible = true
- return $scope.client = client
- }
+ $scope.clientFormVisible = true;
+ return $scope.client = client;
+ };
$scope.deleteClient = index =>
dialogs.confirm({
@@ -63,16 +63,16 @@ Application.Controllers.controller('OpenAPIClientsController', ['$scope', 'clien
return {
title: _t('confirmation_required'),
msg: _t('do_you_really_want_to_delete_this_open_api_client')
- }
+ };
}
}
}
, () =>
OpenAPIClient.delete({ id: $scope.clients[index].id }, function () {
- $scope.clients.splice(index, 1)
- return growl.success(_t('client_successfully_deleted'))
+ $scope.clients.splice(index, 1);
+ return growl.success(_t('client_successfully_deleted'));
})
- )
+ );
return $scope.resetToken = client =>
dialogs.confirm({
@@ -81,16 +81,16 @@ Application.Controllers.controller('OpenAPIClientsController', ['$scope', 'clien
return {
title: _t('confirmation_required'),
msg: _t('do_you_really_want_to_revoke_this_open_api_access')
- }
+ };
}
}
}
, () =>
OpenAPIClient.resetToken({ id: client.id }, {}, function (clientResp) {
- client.token = clientResp.token
- return growl.success(_t('access_successfully_revoked'))
+ client.token = clientResp.token;
+ return growl.success(_t('access_successfully_revoked'));
})
- )
+ );
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/admin/plans.js.erb b/app/assets/javascripts/controllers/admin/plans.js.erb
index a2604fd90..b7846bc21 100644
--- a/app/assets/javascripts/controllers/admin/plans.js.erb
+++ b/app/assets/javascripts/controllers/admin/plans.js.erb
@@ -16,23 +16,23 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
/* COMMON CODE */
class PlanController {
constructor ($scope, groups, prices, partners, CSRF) {
// protection against request forgery
- CSRF.setMetaTags()
+ CSRF.setMetaTags();
// groups list
- $scope.groups = groups.filter(function (g) { return (g.slug !== 'admins') && !g.disabled })
+ $scope.groups = groups.filter(function (g) { return (g.slug !== 'admins') && !g.disabled; });
// users with role 'partner', notifiables for a partner plan
- $scope.partners = partners.users
+ $scope.partners = partners.users;
// Subscriptions prices, machines prices and training prices, per groups
- $scope.group_pricing = prices
+ $scope.group_pricing = prices;
/**
* For use with 'ng-class', returns the CSS class name for the uploads previews.
@@ -41,11 +41,11 @@ class PlanController {
*/
$scope.fileinputClass = function (v) {
if (v) {
- return 'fileinput-exists'
+ return 'fileinput-exists';
} else {
- return 'fileinput-new'
+ return 'fileinput-new';
}
- }
+ };
/**
* Mark the provided file for deletion
@@ -53,9 +53,9 @@ class PlanController {
*/
$scope.deleteFile = function (file) {
if ((file != null) && (file.id != null)) {
- return file._destroy = true
+ return file._destroy = true;
}
- }
+ };
}
}
@@ -67,13 +67,13 @@ Application.Controllers.controller('NewPlanController', ['$scope', '$uibModal',
/* PUBLIC SCOPE */
// current form is used to create a new plan
- $scope.mode = 'creation'
+ $scope.mode = 'creation';
// prices bindings
$scope.prices = {
training: {},
machine: {}
- }
+ };
// form inputs bindings
$scope.plan = {
@@ -86,19 +86,19 @@ Application.Controllers.controller('NewPlanController', ['$scope', '$uibModal',
partnerId: null,
partnerContact: null,
ui_weight: 0
- }
+ };
// API URL where the form will be posted
- $scope.actionUrl = '/api/plans/'
+ $scope.actionUrl = '/api/plans/';
// HTTP method for the rest API
- $scope.method = 'POST'
+ $scope.method = 'POST';
/**
* Checks if the partner contact is a valid data. Used in the form validation process
* @returns {boolean}
*/
- $scope.partnerIsValid = function () { return ($scope.plan.type === 'Plan') || ($scope.plan.partnerId || ($scope.plan.partnerContact && $scope.plan.partnerContact.email)) }
+ $scope.partnerIsValid = function () { return ($scope.plan.type === 'Plan') || ($scope.plan.partnerId || ($scope.plan.partnerContact && $scope.plan.partnerContact.email)); };
/**
* Open a modal dialog allowing the admin to create a new partner user
@@ -109,32 +109,32 @@ Application.Controllers.controller('NewPlanController', ['$scope', '$uibModal',
templateUrl: '<%= asset_path "shared/_partner_new_modal.html" %>',
size: 'lg',
controller: ['$scope', '$uibModalInstance', 'User', function ($scope, $uibModalInstance, User) {
- $scope.partner = {}
+ $scope.partner = {};
$scope.ok = function () {
User.save(
{},
{ user: $scope.partner },
function (user) {
- $scope.partner.id = user.id
- $scope.partner.name = `${user.first_name} ${user.last_name}`
- $uibModalInstance.close($scope.partner)
+ $scope.partner.id = user.id;
+ $scope.partner.name = `${user.first_name} ${user.last_name}`;
+ $uibModalInstance.close($scope.partner);
},
function (error) {
- growl.error(_t('new_plan.unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name'))
- console.error(error)
+ growl.error(_t('new_plan.unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name'));
+ console.error(error);
}
- )
- }
- $scope.cancel = function () { $uibModalInstance.dismiss('cancel') }
+ );
+ };
+ $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); };
}]
- })
+ });
// once the form was validated successfully ...
return modalInstance.result.then(function (partner) {
- $scope.partners.push(partner)
- return $scope.plan.partnerId = partner.id
- })
- }
+ $scope.partners.push(partner);
+ return $scope.plan.partnerId = partner.id;
+ });
+ };
/**
* Display some messages and redirect the user, once the form was submitted, depending on the result status
@@ -143,22 +143,22 @@ Application.Controllers.controller('NewPlanController', ['$scope', '$uibModal',
*/
$scope.afterSubmit = function (content) {
if ((content.id == null) && (content.plan_ids == null)) {
- return growl.error(_t('new_plan.unable_to_create_the_subscription_please_try_again'))
+ return growl.error(_t('new_plan.unable_to_create_the_subscription_please_try_again'));
} else {
- growl.success(_t('new_plan.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 != null) {
- return $state.go('app.admin.pricing')
+ return $state.go('app.admin.pricing');
} else {
if (content.id != null) {
- return $state.go('app.admin.plans.edit', { id: content.id })
+ return $state.go('app.admin.plans.edit', { id: content.id });
}
}
}
- }
+ };
- return new PlanController($scope, groups, prices, partners, CSRF)
+ return new PlanController($scope, groups, prices, partners, CSRF);
}
-])
+]);
/**
* Controller used in the plan edition form
@@ -168,30 +168,30 @@ Application.Controllers.controller('EditPlanController', ['$scope', 'groups', 'p
/* PUBLIC SCOPE */
// List of spaces
- $scope.spaces = spaces
+ $scope.spaces = spaces;
// List of plans
- $scope.plans = plans
+ $scope.plans = plans;
// List of machines
- $scope.machines = machines
+ $scope.machines = machines;
// List of groups
- $scope.groups = groups
+ $scope.groups = groups;
// current form is used for edition mode
- $scope.mode = 'edition'
+ $scope.mode = 'edition';
// edited plan data
- $scope.plan = planPromise
- if ($scope.plan.type === null) { $scope.plan.type = 'Plan' }
- if ($scope.plan.disabled) { $scope.plan.disabled = 'true' }
+ $scope.plan = planPromise;
+ if ($scope.plan.type === null) { $scope.plan.type = 'Plan'; }
+ if ($scope.plan.disabled) { $scope.plan.disabled = 'true'; }
// API URL where the form will be posted
- $scope.actionUrl = `/api/plans/${$stateParams.id}`
+ $scope.actionUrl = `/api/plans/${$stateParams.id}`;
// HTTP method for the rest API
- $scope.method = 'PATCH'
+ $scope.method = 'PATCH';
/**
* If a parent plan was set ($scope.plan.parent), the prices will be copied from this parent plan into
@@ -202,34 +202,34 @@ Application.Controllers.controller('EditPlanController', ['$scope', 'groups', 'p
return Plan.get({ id: $scope.plan.parent }, function (parentPlan) {
Array.from(parentPlan.prices).map(function (parentPrice) {
return (function () {
- const result = []
+ const result = [];
for (let childKey in $scope.plan.prices) {
- const childPrice = $scope.plan.prices[childKey]
+ const childPrice = $scope.plan.prices[childKey];
if ((childPrice.priceable_type === parentPrice.priceable_type) && (childPrice.priceable_id === parentPrice.priceable_id)) {
- $scope.plan.prices[childKey].amount = parentPrice.amount
- break
+ $scope.plan.prices[childKey].amount = parentPrice.amount;
+ break;
} else {
- result.push(undefined)
+ result.push(undefined);
}
}
- return result
- })()
- })
+ return result;
+ })();
+ });
}
- )
+ );
// if no plan were selected, unset every prices
} else {
return (function () {
- const result = []
+ const result = [];
for (let key in $scope.plan.prices) {
- const price = $scope.plan.prices[key]
- result.push($scope.plan.prices[key].amount = 0)
+ const price = $scope.plan.prices[key];
+ result.push($scope.plan.prices[key].amount = 0);
}
- return result
- })()
+ return result;
+ })();
}
- }
+ };
/**
* Display some messages once the form was submitted, depending on the result status (failed/succeeded)
@@ -237,12 +237,12 @@ Application.Controllers.controller('EditPlanController', ['$scope', 'groups', 'p
*/
$scope.afterSubmit = function (content) {
if ((content.id == null) && (content.plan_ids == null)) {
- return growl.error(_t('edit_plan.unable_to_save_subscription_changes_please_try_again'))
+ return growl.error(_t('edit_plan.unable_to_save_subscription_changes_please_try_again'));
} else {
- growl.success(_t('edit_plan.subscription_successfully_changed'))
- return $state.go('app.admin.pricing')
+ growl.success(_t('edit_plan.subscription_successfully_changed'));
+ return $state.go('app.admin.pricing');
}
- }
+ };
/**
* Generate a string identifying the given plan by literal humain-readable name
@@ -252,7 +252,7 @@ Application.Controllers.controller('EditPlanController', ['$scope', 'groups', 'p
* will be included.
* @returns {String}
*/
- $scope.humanReadablePlanName = function (plan, groups, short) { return `${$filter('humanReadablePlanName')(plan, groups, short)}` }
+ $scope.humanReadablePlanName = function (plan, groups, short) { return `${$filter('humanReadablePlanName')(plan, groups, short)}`; };
/**
* Retrieve the machine from its ID
@@ -262,10 +262,10 @@ Application.Controllers.controller('EditPlanController', ['$scope', 'groups', 'p
$scope.getMachine = function (machine_id) {
for (let machine of Array.from($scope.machines)) {
if (machine.id === machine_id) {
- return machine
+ return machine;
}
}
- }
+ };
/**
* Retrieve the space from its ID
@@ -275,12 +275,12 @@ Application.Controllers.controller('EditPlanController', ['$scope', 'groups', 'p
$scope.getSpace = function (space_id) {
for (let space of Array.from($scope.spaces)) {
if (space.id === space_id) {
- return space
+ return space;
}
}
- }
+ };
// Using the PlansController
- return new PlanController($scope, groups, prices, partners, CSRF)
+ return new PlanController($scope, groups, prices, partners, CSRF);
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/admin/price_category.js b/app/assets/javascripts/controllers/admin/price_category.js
index 91f42c30f..26568fbe9 100644
--- a/app/assets/javascripts/controllers/admin/price_category.js
+++ b/app/assets/javascripts/controllers/admin/price_category.js
@@ -9,7 +9,7 @@
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
/**
* Controller used in price category creation/edition form dialog
@@ -17,16 +17,16 @@
Application.Controllers.controller('PriceCategoryController', ['$scope', '$uibModalInstance', 'category',
function ($scope, $uibModalInstance, category) {
// Price category to edit/empty object for new category
- $scope.category = category
+ $scope.category = category;
/**
* Callback for form validation
*/
- $scope.ok = () => $uibModalInstance.close($scope.category)
+ $scope.ok = () => $uibModalInstance.close($scope.category);
/**
* Do not validate the modifications, hide the modal
*/
- return $scope.cancel = () => $uibModalInstance.dismiss('cancel')
+ return $scope.cancel = () => $uibModalInstance.dismiss('cancel');
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/admin/pricing.js.erb b/app/assets/javascripts/controllers/admin/pricing.js.erb
index 04e78cc90..98e2498fe 100644
--- a/app/assets/javascripts/controllers/admin/pricing.js.erb
+++ b/app/assets/javascripts/controllers/admin/pricing.js.erb
@@ -13,7 +13,7 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
/**
* Controller used in the prices edition page
@@ -22,80 +22,80 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
function ($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)
- $scope.machinesPrices = machinesPricesPromise
+ $scope.machinesPrices = machinesPricesPromise;
// List of trainings pricing
- $scope.trainingsPricings = trainingsPricingsPromise
+ $scope.trainingsPricings = trainingsPricingsPromise;
// List of available subscriptions plans (eg. student/month, PME/year ...)
- $scope.plans = plans
- $scope.enabledPlans = plans.filter(function (p) { return !p.disabled })
+ $scope.plans = plans;
+ $scope.enabledPlans = plans.filter(function (p) { return !p.disabled; });
// List of groups (eg. normal, student ...)
- $scope.groups = groups.filter(function (g) { return g.slug !== 'admins' })
- $scope.enabledGroups = groups.filter(function (g) { return (g.slug !== 'admins') && !g.disabled })
+ $scope.groups = groups.filter(function (g) { return g.slug !== 'admins'; });
+ $scope.enabledGroups = groups.filter(function (g) { return (g.slug !== 'admins') && !g.disabled; });
// Associate free machine hours with subscriptions
- $scope.machineCredits = machineCreditsPromise
+ $scope.machineCredits = machineCreditsPromise;
// Array of associations (plan <-> training)
- $scope.trainingCredits = trainingCreditsPromise
+ $scope.trainingCredits = trainingCreditsPromise;
// Associate a plan with all its trainings ids
- $scope.trainingCreditsGroups = {}
+ $scope.trainingCreditsGroups = {};
// List of trainings
- $scope.trainings = trainingsPromise.filter(function (t) { return !t.disabled })
+ $scope.trainings = trainingsPromise.filter(function (t) { return !t.disabled; });
// List of machines
- $scope.machines = machinesPromise
- $scope.enabledMachines = machinesPromise.filter(function (m) { return !m.disabled })
+ $scope.machines = machinesPromise;
+ $scope.enabledMachines = machinesPromise.filter(function (m) { return !m.disabled; });
// List of coupons
- $scope.coupons = couponsPromise
+ $scope.coupons = couponsPromise;
// List of spaces
- $scope.spaces = spacesPromise
- $scope.enabledSpaces = spacesPromise.filter(function (s) { return !s.disabled })
+ $scope.spaces = spacesPromise;
+ $scope.enabledSpaces = spacesPromise.filter(function (s) { return !s.disabled; });
// Associate free space hours with subscriptions
- $scope.spaceCredits = spacesCreditsPromise
+ $scope.spaceCredits = spacesCreditsPromise;
// List of spaces prices (not considering any plan)
- $scope.spacesPrices = spacesPricesPromise
+ $scope.spacesPrices = spacesPricesPromise;
// The plans list ordering. Default: by group
- $scope.orderPlans = 'group_id'
+ $scope.orderPlans = 'group_id';
// Status of the drop-down menu in Credits tab
$scope.status =
- { isopen: false }
+ { isopen: false };
// Default: we show only enabled plans
- $scope.planFiltering = 'enabled'
+ $scope.planFiltering = 'enabled';
// Available options for filtering plans by status
$scope.filterDisabled = [
'enabled',
'disabled',
'all'
- ]
+ ];
$scope.findTrainingsPricing = function (trainingsPricings, trainingId, groupId) {
for (let trainingsPricing of Array.from(trainingsPricings)) {
if ((trainingsPricing.training_id === trainingId) && (trainingsPricing.group_id === groupId)) {
- return trainingsPricing
+ return trainingsPricing;
}
}
- }
+ };
$scope.updateTrainingsPricing = function (data, trainingsPricing) {
if (data != null) {
- return TrainingsPricing.update({ id: trainingsPricing.id }, { trainings_pricing: { amount: data } }).$promise
+ return TrainingsPricing.update({ id: trainingsPricing.id }, { trainings_pricing: { amount: data } }).$promise;
} else {
- return _t('pricing.please_specify_a_number')
+ return _t('pricing.please_specify_a_number');
}
- }
+ };
/**
* Retrieve a plan from its given identifier and returns it
@@ -105,10 +105,10 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
$scope.getPlanFromId = function (id) {
for (let plan of Array.from($scope.plans)) {
if (plan.id === parseInt(id)) {
- return plan
+ return plan;
}
}
- }
+ };
/**
* Retrieve a group from its given identifier and returns it
@@ -118,10 +118,10 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
$scope.getGroupFromId = function (groups, id) {
for (let group of Array.from(groups)) {
if (group.id === parseInt(id)) {
- return group
+ return group;
}
}
- }
+ };
/**
* Returns a human readable string of named trainings, according to the provided array.
@@ -131,17 +131,17 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
*/
$scope.showTrainings = function (trainings) {
if (!angular.isArray(trainings) || !(trainings.length > 0)) {
- return _t('pricing.none')
+ return _t('pricing.none');
}
- const selected = []
+ const selected = [];
angular.forEach($scope.trainings, function (t) {
if (trainings.indexOf(t.id) >= 0) {
- return selected.push(t.name)
+ return selected.push(t.name);
}
- })
- if (selected.length) { return selected.join(' | ') } else { return _t('pricing.none') }
- }
+ });
+ if (selected.length) { return selected.join(' | '); } else { return _t('pricing.none'); }
+ };
/**
* Validation callback when editing training's credits. Save the changes.
@@ -155,10 +155,10 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
{ training_credit_nb: newdata.training_credits }
, angular.noop() // do nothing in case of success
, function (error) {
- growl.error(_t('pricing.an_error_occurred_while_saving_the_number_of_credits'))
- console.error(error)
+ growl.error(_t('pricing.an_error_occurred_while_saving_the_number_of_credits'));
+ console.error(error);
}
- )
+ );
// save the associated trainings
return angular.forEach($scope.trainingCreditsGroups, function (original, key) {
@@ -167,22 +167,22 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
// iterate through the previous credits to remove
angular.forEach(original, function (oldTrainingId) {
if (newdata.training_ids.indexOf(oldTrainingId) === -1) {
- const tc = findTrainingCredit(oldTrainingId, planId)
+ const tc = findTrainingCredit(oldTrainingId, planId);
if (tc) {
return tc.$delete({}
, function () {
- $scope.trainingCredits.splice($scope.trainingCredits.indexOf(tc), 1)
- return $scope.trainingCreditsGroups[planId].splice($scope.trainingCreditsGroups[planId].indexOf(tc.id), 1)
+ $scope.trainingCredits.splice($scope.trainingCredits.indexOf(tc), 1);
+ return $scope.trainingCreditsGroups[planId].splice($scope.trainingCreditsGroups[planId].indexOf(tc.id), 1);
}
, function (error) {
- growl.error(_t('pricing.an_error_occurred_while_deleting_credit_with_the_TRAINING', { TRAINING: tc.creditable.name }))
- console.error(error)
- })
+ growl.error(_t('pricing.an_error_occurred_while_deleting_credit_with_the_TRAINING', { TRAINING: tc.creditable.name }));
+ console.error(error);
+ });
} else {
- return growl.error(_t('pricing.an_error_occurred_unable_to_find_the_credit_to_revoke'))
+ return growl.error(_t('pricing.an_error_occurred_unable_to_find_the_credit_to_revoke'));
}
}
- })
+ });
// iterate through the new credits to add
return angular.forEach(newdata.training_ids, function (newTrainingId) {
@@ -195,39 +195,39 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
}
}
, function (newTc) { // success
- $scope.trainingCredits.push(newTc)
- return $scope.trainingCreditsGroups[newTc.plan_id].push(newTc.creditable_id)
+ $scope.trainingCredits.push(newTc);
+ return $scope.trainingCreditsGroups[newTc.plan_id].push(newTc.creditable_id);
}
, function (error) { // failed
- const training = getTrainingFromId(newTrainingId)
- growl.error(_t('pricing.an_error_occurred_while_creating_credit_with_the_TRAINING', { TRAINING: training.name }))
- return console.error(error)
- })
+ const training = getTrainingFromId(newTrainingId);
+ growl.error(_t('pricing.an_error_occurred_while_creating_credit_with_the_TRAINING', { TRAINING: training.name }));
+ return console.error(error);
+ });
}
- })
+ });
}
}
- })
- }
+ });
+ };
/**
* Cancel the current training credit modification
* @param rowform {Object} see http://vitalets.github.io/angular-xeditable/
*/
- $scope.cancelTrainingCredit = function (rowform) { rowform.$cancel() }
+ $scope.cancelTrainingCredit = function (rowform) { rowform.$cancel(); };
/**
* Create a new empty entry in the $scope.machineCredits array
* @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
$scope.addMachineCredit = function (e) {
- e.preventDefault()
- e.stopPropagation()
+ e.preventDefault();
+ e.stopPropagation();
$scope.inserted =
- { creditable_type: 'Machine' }
- $scope.machineCredits.push($scope.inserted)
- return $scope.status.isopen = !$scope.status.isopen
- }
+ { creditable_type: 'Machine' };
+ $scope.machineCredits.push($scope.inserted);
+ return $scope.status.isopen = !$scope.status.isopen;
+ };
/**
* In the Credits tab, return the name of the machine/space associated with the given credit
@@ -235,16 +235,16 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
* @returns {String}
*/
$scope.showCreditableName = function (credit) {
- let selected = _t('pricing.not_set')
+ let selected = _t('pricing.not_set');
if (credit && credit.creditable_id) {
- const object = $scope.getCreditable(credit)
- selected = object.name
+ const object = $scope.getCreditable(credit);
+ selected = object.name;
if (credit.creditable_type === 'Machine') {
- selected += ` ( id. ${object.id} )`
+ selected += ` ( id. ${object.id} )`;
}
}
- return selected
- }
+ return selected;
+ };
/**
* In the Credits tab, return the machine/space associated with the given credit
@@ -252,24 +252,24 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
* @returns {Object}
*/
$scope.getCreditable = function (credit) {
- let selected
+ let selected;
if (credit && credit.creditable_id) {
if (credit.creditable_type === 'Machine') {
angular.forEach($scope.machines, function (m) {
if (m.id === credit.creditable_id) {
- return selected = m
+ return selected = m;
}
- })
+ });
} else if (credit.creditable_type === 'Space') {
angular.forEach($scope.spaces, function (s) {
if (s.id === credit.creditable_id) {
- return selected = s
+ return selected = s;
}
- })
+ });
}
}
- return selected
- }
+ return selected;
+ };
/**
* Validation callback when editing machine's credits. Save the changes.
@@ -280,31 +280,31 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
$scope.saveMachineCredit = function (data, id) {
for (let mc of Array.from($scope.machineCredits)) {
if ((mc.plan_id === data.plan_id) && (mc.creditable_id === data.creditable_id) && ((id === null) || (mc.id !== id))) {
- growl.error(_t('pricing.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'));
if (!id) {
- $scope.machineCredits.pop()
+ $scope.machineCredits.pop();
}
- return false
+ return false;
}
}
if (id != null) {
- return Credit.update({ id }, { credit: data }, function () { growl.success(_t('pricing.changes_have_been_successfully_saved')) })
+ return Credit.update({ id }, { credit: data }, function () { growl.success(_t('pricing.changes_have_been_successfully_saved')); });
} else {
- data.creditable_type = 'Machine'
+ data.creditable_type = 'Machine';
return Credit.save(
{ credit: data }
, function (resp) {
- $scope.machineCredits[$scope.machineCredits.length - 1].id = resp.id
- return growl.success(_t('pricing.credit_was_successfully_saved'))
+ $scope.machineCredits[$scope.machineCredits.length - 1].id = resp.id;
+ return growl.success(_t('pricing.credit_was_successfully_saved'));
}
, function (err) {
- $scope.machineCredits.pop()
- growl.error(_t('pricing.error_creating_credit'))
- console.error(err)
- })
+ $scope.machineCredits.pop();
+ growl.error(_t('pricing.error_creating_credit'));
+ console.error(err);
+ });
}
- }
+ };
/**
* Removes the newly inserted but not saved machine credit / Cancel the current machine credit modification
@@ -313,33 +313,33 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
*/
$scope.cancelMachineCredit = function (rowform, index) {
if ($scope.machineCredits[index].id != null) {
- return rowform.$cancel()
+ return rowform.$cancel();
} else {
- return $scope.machineCredits.splice(index, 1)
+ return $scope.machineCredits.splice(index, 1);
}
- }
+ };
/**
* Deletes the machine credit at the specified index
* @param index {number} machine credit index in the $scope.machineCredits array
*/
$scope.removeMachineCredit = function (index) {
- Credit.delete($scope.machineCredits[index])
- $scope.machineCredits.splice(index, 1)
- }
+ Credit.delete($scope.machineCredits[index]);
+ $scope.machineCredits.splice(index, 1);
+ };
/**
* Create a new empty entry in the $scope.spaceCredits array
* @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
$scope.addSpaceCredit = function (e) {
- e.preventDefault()
- e.stopPropagation()
+ e.preventDefault();
+ e.stopPropagation();
$scope.inserted =
- { creditable_type: 'Space' }
- $scope.spaceCredits.push($scope.inserted)
- $scope.status.isopen = !$scope.status.isopen
- }
+ { creditable_type: 'Space' };
+ $scope.spaceCredits.push($scope.inserted);
+ $scope.status.isopen = !$scope.status.isopen;
+ };
/**
* Validation callback when editing space's credits. Save the changes.
@@ -350,30 +350,30 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
$scope.saveSpaceCredit = function (data, id) {
for (let sc of Array.from($scope.spaceCredits)) {
if ((sc.plan_id === data.plan_id) && (sc.creditable_id === data.creditable_id) && ((id === null) || (sc.id !== id))) {
- growl.error(_t('pricing.error_a_credit_linking_this_space_with_that_subscription_already_exists'))
+ growl.error(_t('pricing.error_a_credit_linking_this_space_with_that_subscription_already_exists'));
if (!id) {
- $scope.spaceCredits.pop()
+ $scope.spaceCredits.pop();
}
- return false
+ return false;
}
}
if (id != null) {
- return Credit.update({ id }, { credit: data }, function () { growl.success(_t('pricing.changes_have_been_successfully_saved')) })
+ return Credit.update({ id }, { credit: data }, function () { growl.success(_t('pricing.changes_have_been_successfully_saved')); });
} else {
- data.creditable_type = 'Space'
+ data.creditable_type = 'Space';
return Credit.save(
{ credit: data }
, function (resp) {
- $scope.spaceCredits[$scope.spaceCredits.length - 1].id = resp.id
- return growl.success(_t('pricing.credit_was_successfully_saved'))
+ $scope.spaceCredits[$scope.spaceCredits.length - 1].id = resp.id;
+ return growl.success(_t('pricing.credit_was_successfully_saved'));
}
, function (err) {
- $scope.spaceCredits.pop()
- return growl.error(_t('pricing.error_creating_credit'))
- })
+ $scope.spaceCredits.pop();
+ return growl.error(_t('pricing.error_creating_credit'));
+ });
}
- }
+ };
/**
* Removes the newly inserted but not saved space credit / Cancel the current space credit modification
@@ -382,20 +382,20 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
*/
$scope.cancelSpaceCredit = function (rowform, index) {
if ($scope.spaceCredits[index].id != null) {
- return rowform.$cancel()
+ return rowform.$cancel();
} else {
- return $scope.spaceCredits.splice(index, 1)
+ return $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 = function (index) {
- Credit.delete($scope.spaceCredits[index])
- return $scope.spaceCredits.splice(index, 1)
- }
+ Credit.delete($scope.spaceCredits[index]);
+ return $scope.spaceCredits.splice(index, 1);
+ };
/**
* If the plan does not have a type, return a default value for display purposes
@@ -404,9 +404,9 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
*/
$scope.getPlanType = function (type) {
if (type === 'PartnerPlan') {
- return _t('pricing.partner')
- } else { return _t('pricing.standard') }
- }
+ return _t('pricing.partner');
+ } else { return _t('pricing.standard'); }
+ };
/**
* Change the plans ordering criterion to the one provided
@@ -414,11 +414,11 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
*/
$scope.setOrderPlans = function (orderBy) {
if ($scope.orderPlans === orderBy) {
- return $scope.orderPlans = `-${orderBy}`
+ return $scope.orderPlans = `-${orderBy}`;
} else {
- return $scope.orderPlans = orderBy
+ return $scope.orderPlans = orderBy;
}
- }
+ };
/**
* Retrieve a price from prices array by a machineId and a groupId
@@ -426,21 +426,21 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
$scope.findPriceBy = function (prices, machineId, groupId) {
for (let price of Array.from(prices)) {
if ((price.priceable_id === machineId) && (price.group_id === groupId)) {
- return price
+ return price;
}
}
- }
+ };
/**
* update a price for a machine and a group, not considering any plan
*/
$scope.updatePrice = function (data, price) {
if (data != null) {
- return Price.update({ id: price.id }, { price: { amount: data } }).$promise
+ return Price.update({ id: price.id }, { price: { amount: data } }).$promise;
} else {
- return _t('pricing.please_specify_a_number')
+ return _t('pricing.please_specify_a_number');
}
- }
+ };
/**
* Delete the specified subcription plan
@@ -448,7 +448,7 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
*/
$scope.deletePlan = function (plans, id) {
if (typeof id !== 'number') {
- return console.error('[EditPricingController::deletePlan] Error: invalid id parameter')
+ return console.error('[EditPricingController::deletePlan] Error: invalid id parameter');
} else {
// open a confirmation dialog
return dialogs.confirm(
@@ -458,7 +458,7 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
return {
title: _t('pricing.confirmation_required'),
msg: _t('pricing.do_you_really_want_to_delete_this_subscription_plan')
- }
+ };
}
}
},
@@ -467,18 +467,18 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
Plan.delete(
{ id },
function (res) {
- growl.success(_t('pricing.subscription_plan_was_successfully_deleted'))
- return $scope.plans.splice(findItemIdxById(plans, id), 1)
+ growl.success(_t('pricing.subscription_plan_was_successfully_deleted'));
+ return $scope.plans.splice(findItemIdxById(plans, id), 1);
},
function (error) {
- if (error.statusText) { console.error(`[EditPricingController::deletePlan] Error: ${error.statusText}`) }
- growl.error(_t('pricing.unable_to_delete_the_specified_subscription_an_error_occurred'))
+ if (error.statusText) { console.error(`[EditPricingController::deletePlan] Error: ${error.statusText}`); }
+ growl.error(_t('pricing.unable_to_delete_the_specified_subscription_an_error_occurred'));
}
- )
+ );
}
- )
+ );
}
- }
+ };
/**
* Generate a string identifying the given plan by literal humain-readable name
@@ -488,7 +488,7 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
* will be included.
* @returns {String}
*/
- $scope.humanReadablePlanName = function (plan, groups, short) { return `${$filter('humanReadablePlanName')(plan, groups, short)}` }
+ $scope.humanReadablePlanName = function (plan, groups, short) { return `${$filter('humanReadablePlanName')(plan, groups, short)}`; };
/**
* Delete a coupon from the server's database and, in case of success, from the list in memory
@@ -497,7 +497,7 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
*/
$scope.deleteCoupon = function (coupons, id) {
if (typeof id !== 'number') {
- return console.error('[EditPricingController::deleteCoupon] Error: invalid id parameter')
+ return console.error('[EditPricingController::deleteCoupon] Error: invalid id parameter');
} else {
// open a confirmation dialog
return dialogs.confirm({
@@ -506,28 +506,28 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
return {
title: _t('pricing.confirmation_required'),
msg: _t('pricing.do_you_really_want_to_delete_this_coupon')
- }
+ };
}
}
}
, function () {
// the admin has confirmed, delete the coupon
Coupon.delete({ id }, function (res) {
- growl.success(_t('coupon_was_successfully_deleted'))
- return $scope.coupons.splice(findItemIdxById(coupons, id), 1)
+ growl.success(_t('coupon_was_successfully_deleted'));
+ return $scope.coupons.splice(findItemIdxById(coupons, id), 1);
}
, function (error) {
- if (error.statusText) { console.error(`[EditPricingController::deleteCoupon] Error: ${error.statusText}`) }
+ if (error.statusText) { console.error(`[EditPricingController::deleteCoupon] Error: ${error.statusText}`); }
if (error.status === 422) {
- return growl.error(_t('pricing.unable_to_delete_the_specified_coupon_already_in_use'))
+ return growl.error(_t('pricing.unable_to_delete_the_specified_coupon_already_in_use'));
} else {
- return growl.error(_t('pricing.unable_to_delete_the_specified_coupon_an_unexpected_error_occurred'))
+ return growl.error(_t('pricing.unable_to_delete_the_specified_coupon_an_unexpected_error_occurred'));
}
- })
- })
+ });
+ });
}
- }
+ };
/**
* Open a modal allowing to select an user and send him the details of the provided coupon
@@ -537,33 +537,33 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
$uibModal.open({
templateUrl: '<%= asset_path "admin/pricing/sendCoupon.html" %>',
resolve: {
- coupon () { return coupon }
+ coupon () { return coupon; }
},
size: 'md',
controller: ['$scope', '$uibModalInstance', 'Coupon', 'coupon', '_t', function ($scope, $uibModalInstance, Coupon, coupon, _t) {
// Member, receiver of the coupon
$scope.ctrl =
- { member: null }
+ { member: null };
// Details of the coupon to send
- $scope.coupon = coupon
+ $scope.coupon = coupon;
// Callback to validate sending of the coupon
$scope.ok = function () {
Coupon.send({ coupon_code: coupon.code, user_id: $scope.ctrl.member.id }, function (res) {
- growl.success(_t('pricing.coupon_successfully_sent_to_USER', { USER: $scope.ctrl.member.name }))
- return $uibModalInstance.close({ user_id: $scope.ctrl.member.id })
+ growl.success(_t('pricing.coupon_successfully_sent_to_USER', { USER: $scope.ctrl.member.name }));
+ return $uibModalInstance.close({ user_id: $scope.ctrl.member.id });
}
, function (err) {
- growl.error(_t('pricing.an_error_occurred_unable_to_send_the_coupon'))
- console.error(err)
- })
- }
+ growl.error(_t('pricing.an_error_occurred_unable_to_send_the_coupon'));
+ console.error(err);
+ });
+ };
// Callback to close the modal and cancel the sending process
- $scope.cancel = function () { $uibModalInstance.dismiss('cancel') }
+ $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); };
}]
- })
- }
+ });
+ };
/* PRIVATE SCOPE */
@@ -571,21 +571,21 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
* Kind of constructor: these actions will be realized first when the controller is loaded
*/
const initialize = function () {
- $scope.trainingCreditsGroups = groupCreditsByPlan($scope.trainingCredits)
+ $scope.trainingCreditsGroups = groupCreditsByPlan($scope.trainingCredits);
// adds empty array for plan which hasn't any credits yet
return (function () {
- const result = []
+ const result = [];
for (let plan of Array.from($scope.plans)) {
if ($scope.trainingCreditsGroups[plan.id] == null) {
- result.push($scope.trainingCreditsGroups[plan.id] = [])
+ result.push($scope.trainingCreditsGroups[plan.id] = []);
} else {
- result.push(undefined)
+ result.push(undefined);
}
}
- return result
- })()
- }
+ return result;
+ })();
+ };
/**
* Retrieve an item index by its ID from the given array of objects
@@ -594,23 +594,23 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
* @returns {number} item index in the provided array
*/
var findItemIdxById = function (items, id) {
- return (items.map(function (item) { return item.id })).indexOf(id)
- }
+ return (items.map(function (item) { return item.id; })).indexOf(id);
+ };
/**
* Group the given credits array into a map associating the plan ID with its associated trainings/machines
* @return {Object} the association map
*/
var groupCreditsByPlan = function (credits) {
- const creditsMap = {}
+ const creditsMap = {};
angular.forEach(credits, function (c) {
if (!creditsMap[c.plan_id]) {
- creditsMap[c.plan_id] = []
+ creditsMap[c.plan_id] = [];
}
- return creditsMap[c.plan_id].push(c.creditable_id)
- })
- return creditsMap
- }
+ return creditsMap[c.plan_id].push(c.creditable_id);
+ });
+ return creditsMap;
+ };
/**
* Iterate through $scope.traininfCredits to find the credit matching the given criterion
@@ -618,15 +618,15 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
* @param planId {number|string} plan ID
*/
var findTrainingCredit = function (trainingId, planId) {
- trainingId = parseInt(trainingId)
- planId = parseInt(planId)
+ trainingId = parseInt(trainingId);
+ planId = parseInt(planId);
for (let credit of Array.from($scope.trainingCredits)) {
if ((credit.plan_id === planId) && (credit.creditable_id === trainingId)) {
- return credit
+ return credit;
}
}
- }
+ };
/**
* Retrieve a training from its given identifier and returns it
@@ -636,12 +636,12 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state',
var getTrainingFromId = function (id) {
for (let training of Array.from($scope.trainings)) {
if (training.id === parseInt(id)) {
- return training
+ return training;
}
}
- }
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/admin/project_elements.js b/app/assets/javascripts/controllers/admin/project_elements.js
index 024251411..60157f14c 100644
--- a/app/assets/javascripts/controllers/admin/project_elements.js
+++ b/app/assets/javascripts/controllers/admin/project_elements.js
@@ -10,18 +10,18 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
Application.Controllers.controller('ProjectElementsController', ['$scope', '$state', 'Component', 'Licence', 'Theme', 'componentsPromise', 'licencesPromise', 'themesPromise',
function ($scope, $state, Component, Licence, Theme, componentsPromise, licencesPromise, themesPromise) {
// Materials list (plastic, wood ...)
- $scope.components = componentsPromise
+ $scope.components = componentsPromise;
// Licences list (Creative Common ...)
- $scope.licences = licencesPromise
+ $scope.licences = licencesPromise;
// Themes list (cooking, sport ...)
- $scope.themes = themesPromise
+ $scope.themes = themesPromise;
/**
* Saves a new component / Update an existing material to the server (form validation callback)
@@ -30,29 +30,29 @@ Application.Controllers.controller('ProjectElementsController', ['$scope', '$sta
*/
$scope.saveComponent = function (data, id) {
if (id != null) {
- return Component.update({ id }, data)
+ return Component.update({ id }, data);
} else {
- return Component.save(data, resp => $scope.components[$scope.components.length - 1].id = resp.id)
+ return Component.save(data, resp => $scope.components[$scope.components.length - 1].id = resp.id);
}
- }
+ };
/**
* Deletes the component at the specified index
* @param index {number} component index in the $scope.components array
*/
$scope.removeComponent = function (index) {
- Component.delete($scope.components[index])
- return $scope.components.splice(index, 1)
- }
+ Component.delete($scope.components[index]);
+ return $scope.components.splice(index, 1);
+ };
/**
* Creates a new empty entry in the $scope.components array
*/
$scope.addComponent = function () {
$scope.inserted =
- { name: '' }
- return $scope.components.push($scope.inserted)
- }
+ { name: '' };
+ return $scope.components.push($scope.inserted);
+ };
/**
* Removes the newly inserted but not saved component / Cancel the current component modification
@@ -61,11 +61,11 @@ Application.Controllers.controller('ProjectElementsController', ['$scope', '$sta
*/
$scope.cancelComponent = function (rowform, index) {
if ($scope.components[index].id != null) {
- return rowform.$cancel()
+ return rowform.$cancel();
} else {
- return $scope.components.splice(index, 1)
+ return $scope.components.splice(index, 1);
}
- }
+ };
/**
* Saves a new theme / Update an existing theme to the server (form validation callback)
@@ -74,29 +74,29 @@ Application.Controllers.controller('ProjectElementsController', ['$scope', '$sta
*/
$scope.saveTheme = function (data, id) {
if (id != null) {
- return Theme.update({ id }, data)
+ return Theme.update({ id }, data);
} else {
- return Theme.save(data, resp => $scope.themes[$scope.themes.length - 1].id = resp.id)
+ return Theme.save(data, resp => $scope.themes[$scope.themes.length - 1].id = resp.id);
}
- }
+ };
/**
* Deletes the theme at the specified index
* @param index {number} theme index in the $scope.themes array
*/
$scope.removeTheme = function (index) {
- Theme.delete($scope.themes[index])
- return $scope.themes.splice(index, 1)
- }
+ Theme.delete($scope.themes[index]);
+ return $scope.themes.splice(index, 1);
+ };
/**
* Creates a new empty entry in the $scope.themes array
*/
$scope.addTheme = function () {
$scope.inserted =
- { name: '' }
- return $scope.themes.push($scope.inserted)
- }
+ { name: '' };
+ return $scope.themes.push($scope.inserted);
+ };
/**
* Removes the newly inserted but not saved theme / Cancel the current theme modification
@@ -105,11 +105,11 @@ Application.Controllers.controller('ProjectElementsController', ['$scope', '$sta
*/
$scope.cancelTheme = function (rowform, index) {
if ($scope.themes[index].id != null) {
- return rowform.$cancel()
+ return rowform.$cancel();
} else {
- return $scope.themes.splice(index, 1)
+ return $scope.themes.splice(index, 1);
}
- }
+ };
/**
* Saves a new licence / Update an existing licence to the server (form validation callback)
@@ -118,20 +118,20 @@ Application.Controllers.controller('ProjectElementsController', ['$scope', '$sta
*/
$scope.saveLicence = function (data, id) {
if (id != null) {
- return Licence.update({ id }, data)
+ return Licence.update({ id }, data);
} else {
- return Licence.save(data, resp => $scope.licences[$scope.licences.length - 1].id = resp.id)
+ return Licence.save(data, resp => $scope.licences[$scope.licences.length - 1].id = resp.id);
}
- }
+ };
/**
* Deletes the licence at the specified index
* @param index {number} licence index in the $scope.licences array
*/
$scope.removeLicence = function (index) {
- Licence.delete($scope.licences[index])
- return $scope.licences.splice(index, 1)
- }
+ Licence.delete($scope.licences[index]);
+ return $scope.licences.splice(index, 1);
+ };
/**
* Creates a new empty entry in the $scope.licences array
@@ -140,9 +140,9 @@ Application.Controllers.controller('ProjectElementsController', ['$scope', '$sta
$scope.inserted = {
name: '',
description: ''
- }
- return $scope.licences.push($scope.inserted)
- }
+ };
+ return $scope.licences.push($scope.inserted);
+ };
/**
* Removes the newly inserted but not saved licence / Cancel the current licence modification
@@ -151,10 +151,10 @@ Application.Controllers.controller('ProjectElementsController', ['$scope', '$sta
*/
return $scope.cancelLicence = function (rowform, index) {
if ($scope.licences[index].id != null) {
- return rowform.$cancel()
+ return rowform.$cancel();
} else {
- return $scope.licences.splice(index, 1)
+ return $scope.licences.splice(index, 1);
}
- }
+ };
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/admin/settings.js b/app/assets/javascripts/controllers/admin/settings.js
index 5c04eef91..18f17c4bd 100644
--- a/app/assets/javascripts/controllers/admin/settings.js
+++ b/app/assets/javascripts/controllers/admin/settings.js
@@ -10,7 +10,7 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
Application.Controllers.controller('SettingsController', ['$scope', 'Setting', 'growl', 'settingsPromise', 'cgvFile', 'cguFile', 'logoFile', 'logoBlackFile', 'faviconFile', 'profileImageFile', 'CSRF', '_t',
function ($scope, Setting, growl, settingsPromise, cgvFile, cguFile, logoFile, logoBlackFile, faviconFile, profileImageFile, CSRF, _t) {
@@ -20,7 +20,7 @@ Application.Controllers.controller('SettingsController', ['$scope', 'Setting', '
$scope.timepicker = {
hstep: 1,
mstep: 15
- }
+ };
// API URL where the upload forms will be posted
$scope.actionUrl = {
@@ -30,7 +30,7 @@ Application.Controllers.controller('SettingsController', ['$scope', 'Setting', '
logoBlack: '/api/custom_assets',
favicon: '/api/custom_assets',
profileImage: '/api/custom_assets'
- }
+ };
// Form actions on the above URL
$scope.methods = {
@@ -40,84 +40,84 @@ Application.Controllers.controller('SettingsController', ['$scope', 'Setting', '
logoBlack: 'post',
favicon: 'post',
profileImage: 'post'
- }
+ };
// Are we uploading the files currently (if so, display the loader)
$scope.loader = {
cgu: false,
cgv: false
- }
+ };
// various parametrable settings
- $scope.twitterSetting = { name: 'twitter_name', value: settingsPromise.twitter_name }
- $scope.aboutTitleSetting = { name: 'about_title', value: settingsPromise.about_title }
- $scope.aboutBodySetting = { name: 'about_body', value: settingsPromise.about_body }
- $scope.aboutContactsSetting = { name: 'about_contacts', value: settingsPromise.about_contacts }
- $scope.homeBlogpostSetting = { name: 'home_blogpost', value: settingsPromise.home_blogpost }
- $scope.machineExplicationsAlert = { name: 'machine_explications_alert', value: settingsPromise.machine_explications_alert }
- $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 }
- $scope.secondColorSetting = { name: 'secondary_color', value: settingsPromise.secondary_color }
- $scope.fablabName = { name: 'fablab_name', value: settingsPromise.fablab_name }
- $scope.nameGenre = { name: 'name_genre', value: settingsPromise.name_genre }
- $scope.machinesSortBy = { name: 'machines_sort_by', value: settingsPromise.machines_sort_by }
- $scope.cguFile = cguFile.custom_asset
- $scope.cgvFile = cgvFile.custom_asset
- $scope.customLogo = logoFile.custom_asset
- $scope.customLogoBlack = logoBlackFile.custom_asset
- $scope.customFavicon = faviconFile.custom_asset
- $scope.profileImage = profileImageFile.custom_asset
+ $scope.twitterSetting = { name: 'twitter_name', value: settingsPromise.twitter_name };
+ $scope.aboutTitleSetting = { name: 'about_title', value: settingsPromise.about_title };
+ $scope.aboutBodySetting = { name: 'about_body', value: settingsPromise.about_body };
+ $scope.aboutContactsSetting = { name: 'about_contacts', value: settingsPromise.about_contacts };
+ $scope.homeBlogpostSetting = { name: 'home_blogpost', value: settingsPromise.home_blogpost };
+ $scope.machineExplicationsAlert = { name: 'machine_explications_alert', value: settingsPromise.machine_explications_alert };
+ $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 };
+ $scope.secondColorSetting = { name: 'secondary_color', value: settingsPromise.secondary_color };
+ $scope.fablabName = { name: 'fablab_name', value: settingsPromise.fablab_name };
+ $scope.nameGenre = { name: 'name_genre', value: settingsPromise.name_genre };
+ $scope.machinesSortBy = { name: 'machines_sort_by', value: settingsPromise.machines_sort_by };
+ $scope.cguFile = cguFile.custom_asset;
+ $scope.cgvFile = cgvFile.custom_asset;
+ $scope.customLogo = logoFile.custom_asset;
+ $scope.customLogoBlack = logoBlackFile.custom_asset;
+ $scope.customFavicon = faviconFile.custom_asset;
+ $scope.profileImage = profileImageFile.custom_asset;
$scope.enableMove = {
name: 'booking_move_enable',
value: (settingsPromise.booking_move_enable === 'true')
- }
+ };
$scope.moveDelay = {
name: 'booking_move_delay',
value: parseInt(settingsPromise.booking_move_delay, 10)
- }
+ };
$scope.enableCancel = {
name: 'booking_cancel_enable',
value: (settingsPromise.booking_cancel_enable === 'true')
- }
+ };
$scope.cancelDelay = {
name: 'booking_cancel_delay',
value: parseInt(settingsPromise.booking_cancel_delay, 10)
- }
+ };
$scope.enableReminder = {
name: 'reminder_enable',
value: (settingsPromise.reminder_enable === 'true')
- }
+ };
$scope.reminderDelay = {
name: 'reminder_delay',
value: parseInt(settingsPromise.reminder_delay, 10)
- }
+ };
$scope.visibilityYearly = {
name: 'visibility_yearly',
value: parseInt(settingsPromise.visibility_yearly, 10)
- }
+ };
$scope.visibilityOthers = {
name: 'visibility_others',
value: parseInt(settingsPromise.visibility_others, 10)
- }
+ };
$scope.displayNameEnable = {
name: 'display_name_enable',
value: (settingsPromise.display_name_enable === 'true')
- }
+ };
/**
* For use with 'ng-class', returns the CSS class name for the uploads previews.
@@ -126,11 +126,11 @@ Application.Controllers.controller('SettingsController', ['$scope', 'Setting', '
*/
$scope.fileinputClass = function (v) {
if (v) {
- return 'fileinput-exists'
+ return 'fileinput-exists';
} else {
- return 'fileinput-new'
+ return 'fileinput-new';
}
- }
+ };
/**
* Callback to save the setting value to the database
@@ -138,24 +138,24 @@ Application.Controllers.controller('SettingsController', ['$scope', 'Setting', '
*/
$scope.save = function (setting) {
// trim empty html
- let value
+ let value;
if ((setting.value === '
') || (setting.value === '
${html}`)
+ element.find('.fc-title').append(`
${html}`);
}
- }
+ };
const getFilter = function () {
- const t = $scope.trainings.filter(t => t.checked).map(t => t.id)
- const m = $scope.machines.filter(m => m.checked).map(m => m.id)
- const s = $scope.spaces.filter(s => s.checked).map(s => s.id)
- return { t, m, s, evt: $scope.filter.evt, dispo: $scope.filter.dispo }
- }
+ const t = $scope.trainings.filter(t => t.checked).map(t => t.id);
+ const m = $scope.machines.filter(m => m.checked).map(m => m.id);
+ const s = $scope.spaces.filter(s => s.checked).map(s => s.id);
+ return { t, m, s, evt: $scope.filter.evt, dispo: $scope.filter.dispo };
+ };
- var availabilitySourceUrl = () => `/api/availabilities/public?${$.param(getFilter())}`
+ var availabilitySourceUrl = () => `/api/availabilities/public?${$.param(getFilter())}`;
const initialize = () =>
// fullCalendar (v2) configuration
@@ -198,17 +198,17 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$
maxTime: moment.duration(moment(bookingWindowEnd.setting.value).format('HH:mm:ss')),
defaultView: window.innerWidth <= 480 ? 'agendaDay' : 'agendaWeek',
eventClick (event, jsEvent, view) {
- return calendarEventClickCb(event, jsEvent, view)
+ return calendarEventClickCb(event, jsEvent, view);
},
viewRender (view, element) {
- return viewRenderCb(view, element)
+ return viewRenderCb(view, element);
},
eventRender (event, element, view) {
- return eventRenderCb(event, element)
+ return eventRenderCb(event, element);
}
- })
+ });
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/dashboard.js b/app/assets/javascripts/controllers/dashboard.js
index 7fe2a5c6e..0f627cab5 100644
--- a/app/assets/javascripts/controllers/dashboard.js
+++ b/app/assets/javascripts/controllers/dashboard.js
@@ -10,24 +10,24 @@
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
Application.Controllers.controller('DashboardController', ['$scope', 'memberPromise', 'SocialNetworks', function ($scope, memberPromise, SocialNetworks) {
// Current user's profile
- $scope.user = memberPromise
+ $scope.user = memberPromise;
// List of social networks associated with this user and toggle 'show all' state
$scope.social = {
showAllLinks: false,
networks: SocialNetworks
- }
+ };
/* PRIVATE SCOPE */
/**
* Kind of constructor: these actions will be realized first when the controller is loaded
*/
- const initialize = () => $scope.social.networks = filterNetworks()
+ const initialize = () => $scope.social.networks = filterNetworks();
/**
* Filter social network or website that are associated with the profile of the user provided in promise
@@ -35,17 +35,17 @@ Application.Controllers.controller('DashboardController', ['$scope', 'memberProm
* @return {Array}
*/
var filterNetworks = function () {
- const networks = []
+ const networks = [];
for (let network of Array.from(SocialNetworks)) {
if ($scope.user.profile[network] && ($scope.user.profile[network].length > 0)) {
- networks.push(network)
+ networks.push(network);
}
}
- return networks
- }
+ return networks;
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/home.js b/app/assets/javascripts/controllers/home.js
index 8b379efc0..48163226b 100644
--- a/app/assets/javascripts/controllers/home.js
+++ b/app/assets/javascripts/controllers/home.js
@@ -8,36 +8,36 @@
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
Application.Controllers.controller('HomeController', ['$scope', '$stateParams', 'Twitter', 'lastMembersPromise', 'lastProjectsPromise', 'upcomingEventsPromise', 'homeBlogpostPromise', 'twitterNamePromise',
function ($scope, $stateParams, Twitter, lastMembersPromise, lastProjectsPromise, upcomingEventsPromise, homeBlogpostPromise, twitterNamePromise) {
/* PUBLIC SCOPE */
// The last registered members who confirmed their addresses
- $scope.lastMembers = lastMembersPromise
+ $scope.lastMembers = lastMembersPromise;
// The last tweets from the Fablab official twitter account
- $scope.lastTweets = []
+ $scope.lastTweets = [];
// The last projects published/documented on the plateform
- $scope.lastProjects = lastProjectsPromise
+ $scope.lastProjects = lastProjectsPromise;
// The closest upcoming events
- $scope.upcomingEvents = upcomingEventsPromise
+ $scope.upcomingEvents = upcomingEventsPromise;
// The admin blogpost
- $scope.homeBlogpost = homeBlogpostPromise.setting.value
+ $scope.homeBlogpost = homeBlogpostPromise.setting.value;
// Twitter username
- $scope.twitterName = twitterNamePromise.setting.value
+ $scope.twitterName = twitterNamePromise.setting.value;
/**
* Test if the provided event run on a single day or not
* @param event {Object} single event from the $scope.upcomingEvents array
* @returns {boolean} false if the event runs on more that 1 day
*/
- $scope.isOneDayEvent = event => moment(event.start_date).isSame(event.end_date, 'day')
+ $scope.isOneDayEvent = event => moment(event.start_date).isSame(event.end_date, 'day');
/* PRIVATE SCOPE */
@@ -47,16 +47,16 @@ Application.Controllers.controller('HomeController', ['$scope', '$stateParams',
const initialize = function () {
// we retrieve tweets from here instead of ui-router's promise because, if adblock stop the API request,
// this prevent the whole home page to be blocked
- $scope.lastTweets = Twitter.query({ limit: 1 })
+ $scope.lastTweets = Twitter.query({ limit: 1 });
// if we recieve a token to reset the password as GET parameter, trigger the
// changePassword modal from the parent controller
if ($stateParams.reset_password_token) {
- return $scope.$parent.editPassword($stateParams.reset_password_token)
+ return $scope.$parent.editPassword($stateParams.reset_password_token);
}
- }
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/machines.js.erb b/app/assets/javascripts/controllers/machines.js.erb
index c6bb0c59f..e739776ba 100644
--- a/app/assets/javascripts/controllers/machines.js.erb
+++ b/app/assets/javascripts/controllers/machines.js.erb
@@ -12,7 +12,7 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
/* COMMON CODE */
@@ -41,24 +41,24 @@ class MachinesController {
*/
$scope.submited = function (content) {
if ((content.id == null)) {
- $scope.alerts = []
+ $scope.alerts = [];
angular.forEach(content, function (v, k) {
angular.forEach(function (v, err) {
$scope.alerts.push({
msg: k + ': ' + err,
type: 'danger'
- })
- })
- })
+ });
+ });
+ });
} else {
- return $state.go('app.public.machines_list')
+ return $state.go('app.public.machines_list');
}
- }
+ };
/**
* Changes the current user's view, redirecting him to the machines list
*/
- $scope.cancel = function () { $state.go('app.public.machines_list') }
+ $scope.cancel = function () { $state.go('app.public.machines_list'); };
/**
* For use with 'ng-class', returns the CSS class name for the uploads previews.
@@ -67,16 +67,16 @@ class MachinesController {
*/
$scope.fileinputClass = function (v) {
if (v) {
- return 'fileinput-exists'
+ return 'fileinput-exists';
} else {
- return 'fileinput-new'
+ return 'fileinput-new';
}
- }
+ };
/**
* This will create a single new empty entry into the machine attachements list.
*/
- $scope.addFile = function () { $scope.machine.machine_files_attributes.push({}) }
+ $scope.addFile = function () { $scope.machine.machine_files_attributes.push({}); };
/**
* This will remove the given file from the machine attachements list. If the file was previously uploaded
@@ -85,13 +85,13 @@ class MachinesController {
* @param file {Object} the file to delete
*/
$scope.deleteFile = function (file) {
- const index = $scope.machine.machine_files_attributes.indexOf(file)
+ const index = $scope.machine.machine_files_attributes.indexOf(file);
if (file.id != null) {
- return file._destroy = true
+ return file._destroy = true;
} else {
- return $scope.machine.machine_files_attributes.splice(index, 1)
+ return $scope.machine.machine_files_attributes.splice(index, 1);
}
- }
+ };
}
}
@@ -104,16 +104,16 @@ class MachinesController {
* @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
const _reserveMachine = function (machine, e) {
- const _this = this
- e.preventDefault()
- e.stopPropagation()
+ const _this = this;
+ e.preventDefault();
+ e.stopPropagation();
// retrieve the full machine object
return machine = _this.Machine.get({ id: machine.id }, function () {
// 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 || (machine.trainings.length === 0)) {
- return _this.$state.go('app.logged.machines_reserve', { id: machine.slug })
+ return _this.$state.go('app.logged.machines_reserve', { id: machine.slug });
} else {
// otherwise, if a user is authenticated ...
if (_this.$scope.isAuthenticated()) {
@@ -123,59 +123,59 @@ const _reserveMachine = function (machine, e) {
return _this.$uibModal.open({
templateUrl: '<%= asset_path "machines/training_reservation_modal.html" %>',
controller: ['$scope', '$uibModalInstance', '$state', function ($scope, $uibModalInstance, $state) {
- $scope.machine = machine
- return $scope.cancel = function () { $uibModalInstance.dismiss('cancel') }
+ $scope.machine = machine;
+ return $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); };
}
- ] })
+ ] });
// ... but does not have booked the training, tell him to register for a training session first
// unless all associated trainings are disabled
} else {
// if all trainings are disabled, just redirect the user to the reservation calendar
- if (machine.trainings.map(function (t) { return t.disabled }).reduce(function (acc, val) { return acc && val }, true)) {
- return _this.$state.go('app.logged.machines_reserve', { id: machine.slug })
+ if (machine.trainings.map(function (t) { return t.disabled; }).reduce(function (acc, val) { return acc && val; }, true)) {
+ return _this.$state.go('app.logged.machines_reserve', { id: machine.slug });
// otherwise open the information modal
} else {
return _this.$uibModal.open({
templateUrl: '<%= asset_path "machines/request_training_modal.html" %>',
controller: ['$scope', '$uibModalInstance', '$state', function ($scope, $uibModalInstance, $state) {
- $scope.machine = machine
- $scope.member = _this.$scope.currentUser
+ $scope.machine = machine;
+ $scope.member = _this.$scope.currentUser;
// transform the name of the trainings associated with the machine to integrate them in a sentence
$scope.humanizeTrainings = function () {
- let text = ''
+ let text = '';
angular.forEach($scope.machine.trainings, function (training) {
if (text.length > 0) {
- text += _this._t('machines_list._or_the_')
+ text += _this._t('machines_list._or_the_');
}
- return text += training.name.substr(0, 1).toLowerCase() + training.name.substr(1)
- })
- return text
- }
+ return text += training.name.substr(0, 1).toLowerCase() + training.name.substr(1);
+ });
+ return text;
+ };
// modal is closed with validation
$scope.ok = function () {
- $state.go('app.logged.trainings_reserve', { id: $scope.machine.trainings[0].id })
- return $uibModalInstance.close(machine)
- }
+ $state.go('app.logged.trainings_reserve', { id: $scope.machine.trainings[0].id });
+ return $uibModalInstance.close(machine);
+ };
// modal is closed with escaping
return $scope.cancel = function (e) {
- e.preventDefault()
- return $uibModalInstance.dismiss('cancel')
- }
+ e.preventDefault();
+ return $uibModalInstance.dismiss('cancel');
+ };
}
- ] })
+ ] });
}
}
// if the user is not logged, open the login modal window
} else {
- return _this.$scope.login()
+ return _this.$scope.login();
}
}
- })
-}
+ });
+};
/**
* Controller used in the public listing page, allowing everyone to see the list of machines
@@ -183,12 +183,12 @@ const _reserveMachine = function (machine, e) {
Application.Controllers.controller('MachinesController', ['$scope', '$state', '_t', 'Machine', '$uibModal', 'machinesPromise',
function ($scope, $state, _t, Machine, $uibModal, machinesPromise) {
// Retrieve the list of machines
- $scope.machines = machinesPromise
+ $scope.machines = machinesPromise;
/**
* Redirect the user to the machine details page
*/
- $scope.showMachine = function (machine) { $state.go('app.public.machines_show', { id: machine.slug }) }
+ $scope.showMachine = function (machine) { $state.go('app.public.machines_show', { id: machine.slug }); };
/**
* Callback to book a reservation for the current machine
@@ -199,40 +199,40 @@ Application.Controllers.controller('MachinesController', ['$scope', '$state', '_
_t,
$uibModal,
Machine
- })
+ });
// Default: we show only enabled machines
- $scope.machineFiltering = 'enabled'
+ $scope.machineFiltering = 'enabled';
// Available options for filtering machines by status
return $scope.filterDisabled = [
'enabled',
'disabled',
'all'
- ]
+ ];
}
-])
+]);
/**
* Controller used in the machine creation page (admin)
*/
Application.Controllers.controller('NewMachineController', ['$scope', '$state', 'CSRF', function ($scope, $state, CSRF) {
- CSRF.setMetaTags()
+ CSRF.setMetaTags();
// API URL where the form will be posted
- $scope.actionUrl = '/api/machines/'
+ $scope.actionUrl = '/api/machines/';
// Form action on the above URL
- $scope.method = 'post'
+ $scope.method = 'post';
// default machine parameters
$scope.machine =
- { machine_files_attributes: [] }
+ { machine_files_attributes: [] };
// Using the MachinesController
- return new MachinesController($scope, $state)
+ return new MachinesController($scope, $state);
}
-])
+]);
/**
* Controller used in the machine edition page (admin)
@@ -242,13 +242,13 @@ Application.Controllers.controller('EditMachineController', ['$scope', '$state',
/* PUBLIC SCOPE */
// API URL where the form will be posted
- $scope.actionUrl = `/api/machines/${$stateParams.id}`
+ $scope.actionUrl = `/api/machines/${$stateParams.id}`;
// Form action on the above URL
- $scope.method = 'put'
+ $scope.method = 'put';
// Retrieve the details for the machine id in the URL, if an error occurs redirect the user to the machines list
- $scope.machine = machinePromise
+ $scope.machine = machinePromise;
/* PRIVATE SCOPE */
@@ -256,16 +256,16 @@ Application.Controllers.controller('EditMachineController', ['$scope', '$state',
* Kind of constructor: these actions will be realized first when the controller is loaded
*/
const initialize = function () {
- CSRF.setMetaTags()
+ CSRF.setMetaTags();
// Using the MachinesController
- return new MachinesController($scope, $state)
- }
+ return new MachinesController($scope, $state);
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
/**
* Controller used in the machine details page (public)
@@ -273,7 +273,7 @@ Application.Controllers.controller('EditMachineController', ['$scope', '$state',
Application.Controllers.controller('ShowMachineController', ['$scope', '$state', '$uibModal', '$stateParams', '_t', 'Machine', 'growl', 'machinePromise', 'dialogs',
function ($scope, $state, $uibModal, $stateParams, _t, Machine, growl, machinePromise, dialogs) {
// Retrieve the details for the machine id in the URL, if an error occurs redirect the user to the machines list
- $scope.machine = machinePromise
+ $scope.machine = machinePromise;
/**
* Callback to delete the current machine (admins only)
@@ -281,7 +281,7 @@ Application.Controllers.controller('ShowMachineController', ['$scope', '$state',
$scope.delete = function (machine) {
// check the permissions
if ($scope.currentUser.role !== 'admin') {
- console.error(_t('unauthorized_operation'))
+ console.error(_t('unauthorized_operation'));
} else {
dialogs.confirm({
resolve: {
@@ -289,19 +289,19 @@ Application.Controllers.controller('ShowMachineController', ['$scope', '$state',
return {
title: _t('confirmation_required'),
msg: _t('do_you_really_want_to_delete_this_machine')
- }
+ };
}
}
}
, function () { // deletion confirmed
// delete the machine then redirect to the machines listing
machine.$delete(
- function () { $state.go('app.public.machines_list') },
- function (error) { growl.warning(_t('the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users')); console.error(error) }
- )
- })
+ function () { $state.go('app.public.machines_list'); },
+ function (error) { growl.warning(_t('the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users')); console.error(error); }
+ );
+ });
}
- }
+ };
/**
* Callback to book a reservation for the current machine
@@ -312,9 +312,9 @@ Application.Controllers.controller('ShowMachineController', ['$scope', '$state',
_t,
$uibModal,
Machine
- })
+ });
}
-])
+]);
/**
* Controller used in the machine reservation page (for logged users who have completed the training and admins).
@@ -326,27 +326,27 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$stat
/* PRIVATE STATIC CONSTANTS */
// Slot free to be booked
- const FREE_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::MACHINE_COLOR %>'
+ const FREE_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::MACHINE_COLOR %>';
// Slot already booked by another user
- const UNAVAILABLE_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::MACHINE_IS_RESERVED_BY_USER %>'
+ const UNAVAILABLE_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::MACHINE_IS_RESERVED_BY_USER %>';
// Slot already booked by the current user
- const BOOKED_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::IS_RESERVED_BY_CURRENT_USER %>'
+ const BOOKED_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::IS_RESERVED_BY_CURRENT_USER %>';
/* PUBLIC SCOPE */
// bind the machine availabilities with full-Calendar events
- $scope.eventSources = []
+ $scope.eventSources = [];
// indicates the state of the current view : calendar or plans information
- $scope.plansAreShown = false
+ $scope.plansAreShown = false;
// will store the user's plan if he choosed to buy one
- $scope.selectedPlan = null
+ $scope.selectedPlan = null;
// the moment when the plan selection changed for the last time, used to trigger changes in the cart
- $scope.planSelectionTime = null
+ $scope.planSelectionTime = null;
// mapping of fullCalendar events.
$scope.events = {
@@ -355,165 +355,165 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$stat
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: *}
- }
+ };
// the moment when the slot selection changed for the last time, used to trigger changes in the cart
- $scope.selectionTime = null
+ $scope.selectionTime = null;
// the last clicked event in the calender
- $scope.selectedEvent = null
+ $scope.selectedEvent = null;
// the application global settings
- $scope.settings = settingsPromise
+ $scope.settings = settingsPromise;
// list of plans, classified by group
- $scope.plansClassifiedByGroup = []
+ $scope.plansClassifiedByGroup = [];
for (let group of Array.from(groupsPromise)) {
- const groupObj = { id: group.id, name: group.name, plans: [] }
+ const groupObj = { id: group.id, name: group.name, plans: [] };
for (let plan of Array.from(plansPromise)) {
- if (plan.group_id === group.id) { groupObj.plans.push(plan) }
+ if (plan.group_id === group.id) { groupObj.plans.push(plan); }
}
- $scope.plansClassifiedByGroup.push(groupObj)
+ $scope.plansClassifiedByGroup.push(groupObj);
}
// the user to deal with, ie. the current user for non-admins
$scope.ctrl =
- { member: {} }
+ { member: {} };
// current machine to reserve
- $scope.machine = machinePromise
+ $scope.machine = machinePromise;
// fullCalendar (v2) configuration
$scope.calendarConfig = CalendarConfig({
minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')),
maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')),
eventClick (event, jsEvent, view) {
- return calendarEventClickCb(event, jsEvent, view)
+ return calendarEventClickCb(event, jsEvent, view);
},
eventRender (event, element, view) {
- return eventRenderCb(event, element)
+ return eventRenderCb(event, element);
}
- })
+ });
// Global config: message to the end user concerning the subscriptions rules
- $scope.subscriptionExplicationsAlert = settingsPromise.subscription_explications_alert
+ $scope.subscriptionExplicationsAlert = settingsPromise.subscription_explications_alert;
// Global config: message to the end user concerning the machine bookings
- $scope.machineExplicationsAlert = settingsPromise.machine_explications_alert
+ $scope.machineExplicationsAlert = settingsPromise.machine_explications_alert;
/**
* Change the last selected slot's appearence to looks like 'added to cart'
*/
$scope.markSlotAsAdded = function () {
- $scope.selectedEvent.backgroundColor = FREE_SLOT_BORDER_COLOR
- $scope.selectedEvent.title = _t('i_reserve')
- return updateCalendar()
- }
+ $scope.selectedEvent.backgroundColor = FREE_SLOT_BORDER_COLOR;
+ $scope.selectedEvent.title = _t('i_reserve');
+ return updateCalendar();
+ };
/**
* Change the last selected slot's appearence to looks like 'never added to cart'
*/
$scope.markSlotAsRemoved = function (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
- return updateCalendar()
- }
+ 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;
+ return updateCalendar();
+ };
/**
* Callback when a slot was successfully cancelled. Reset the slot style as 'ready to book'
*/
- $scope.slotCancelled = function () { $scope.markSlotAsRemoved($scope.selectedEvent) }
+ $scope.slotCancelled = function () { $scope.markSlotAsRemoved($scope.selectedEvent); };
/**
* Change the last selected slot's appearence to looks like 'currently looking for a new destination to exchange'
*/
$scope.markSlotAsModifying = function () {
- $scope.selectedEvent.backgroundColor = '#eee'
- $scope.selectedEvent.title = _t('i_change')
- return updateCalendar()
- }
+ $scope.selectedEvent.backgroundColor = '#eee';
+ $scope.selectedEvent.title = _t('i_change');
+ return updateCalendar();
+ };
/**
* Change the last selected slot's appearence to looks like 'the slot being exchanged will take this place'
*/
$scope.changeModifyMachineSlot = function () {
if ($scope.events.placable) {
- $scope.events.placable.backgroundColor = 'white'
- $scope.events.placable.title = ''
+ $scope.events.placable.backgroundColor = 'white';
+ $scope.events.placable.title = '';
}
if (!$scope.events.placable || ($scope.events.placable._id !== $scope.selectedEvent._id)) {
- $scope.selectedEvent.backgroundColor = '#bbb'
- $scope.selectedEvent.title = _t('i_shift')
+ $scope.selectedEvent.backgroundColor = '#bbb';
+ $scope.selectedEvent.title = _t('i_shift');
}
- return updateCalendar()
- }
+ return updateCalendar();
+ };
/**
* When modifying an already booked reservation, callback when the modification was successfully done.
*/
$scope.modifyMachineSlot = function () {
- $scope.events.placable.title = $scope.currentUser.role !== 'admin' ? _t('i_ve_reserved') : _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.events.placable.title = $scope.currentUser.role !== 'admin' ? _t('i_ve_reserved') : _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.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
+ $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;
- return updateCalendar()
- }
+ return updateCalendar();
+ };
/**
* Cancel the current booking modification, reseting the whole process
*/
$scope.cancelModifyMachineSlot = function () {
if ($scope.events.placable) {
- $scope.events.placable.backgroundColor = 'white'
- $scope.events.placable.title = ''
+ $scope.events.placable.backgroundColor = 'white';
+ $scope.events.placable.title = '';
}
- $scope.events.modifiable.title = $scope.currentUser.role !== 'admin' ? _t('i_ve_reserved') : _t('not_available')
- $scope.events.modifiable.backgroundColor = 'white'
+ $scope.events.modifiable.title = $scope.currentUser.role !== 'admin' ? _t('i_ve_reserved') : _t('not_available');
+ $scope.events.modifiable.backgroundColor = 'white';
- return updateCalendar()
- }
+ return updateCalendar();
+ };
/**
* Callback to deal with the reservations of the user selected in the dropdown list instead of the current user's
* reservations. (admins only)
*/
$scope.updateMember = function () {
- $scope.plansAreShown = false
- $scope.selectedPlan = null
- Member.get({ id: $scope.ctrl.member.id }, function (member) { $scope.ctrl.member = member })
- }
+ $scope.plansAreShown = false;
+ $scope.selectedPlan = null;
+ Member.get({ id: $scope.ctrl.member.id }, function (member) { $scope.ctrl.member = member; });
+ };
/**
* Changes the user current view from the plan subsription screen to the machine reservation agenda
* @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
$scope.doNotSubscribePlan = function (e) {
- e.preventDefault()
- $scope.plansAreShown = false
- $scope.selectPlan($scope.selectedPlan)
- return $scope.planSelectionTime = new Date()
- }
+ e.preventDefault();
+ $scope.plansAreShown = false;
+ $scope.selectPlan($scope.selectedPlan);
+ return $scope.planSelectionTime = new Date();
+ };
/**
* Switch the user's view from the reservation agenda to the plan subscription
*/
- $scope.showPlans = function () { $scope.plansAreShown = true }
+ $scope.showPlans = function () { $scope.plansAreShown = true; };
/**
* Add the provided plan to the current shopping cart
@@ -522,12 +522,12 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$stat
$scope.selectPlan = function (plan) {
// toggle selected plan
if ($scope.selectedPlan !== plan) {
- $scope.selectedPlan = plan
+ $scope.selectedPlan = plan;
} else {
- $scope.selectedPlan = null
+ $scope.selectedPlan = null;
}
- return $scope.planSelectionTime = new Date()
- }
+ return $scope.planSelectionTime = new Date();
+ };
/**
* Once the reservation is booked (payment process successfully completed), change the event style
@@ -536,34 +536,34 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$stat
*/
$scope.afterPayment = function (reservation) {
angular.forEach($scope.events.reserved, function (machineSlot, key) {
- machineSlot.is_reserved = true
- machineSlot.can_modify = true
+ machineSlot.is_reserved = true;
+ machineSlot.can_modify = true;
if ($scope.currentUser.role !== 'admin') {
- machineSlot.title = _t('i_ve_reserved')
- machineSlot.borderColor = BOOKED_SLOT_BORDER_COLOR
- updateMachineSlot(machineSlot, reservation, $scope.currentUser)
+ 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.title = _t('not_available');
+ machineSlot.borderColor = UNAVAILABLE_SLOT_BORDER_COLOR;
+ updateMachineSlot(machineSlot, reservation, $scope.ctrl.member);
}
- return machineSlot.backgroundColor = 'white'
- })
+ return 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
+ $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan);
+ Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan);
+ $scope.plansAreShown = false;
+ $scope.selectedPlan = null;
}
- return refetchCalendar()
- }
+ return refetchCalendar();
+ };
/**
* To use as callback in Array.prototype.filter to get only enabled plans
*/
- $scope.filterDisabledPlans = function (plan) { return !plan.disabled }
+ $scope.filterDisabledPlans = function (plan) { return !plan.disabled; };
/* PRIVATE SCOPE */
@@ -575,13 +575,13 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$stat
$scope.eventSources.push({
events: availabilities,
textColor: 'black'
- })
- })
+ });
+ });
if ($scope.currentUser.role !== 'admin') {
- return $scope.ctrl.member = $scope.currentUser
+ return $scope.ctrl.member = $scope.currentUser;
}
- }
+ };
/**
* Triggered when the user click on a reservation slot in the agenda.
@@ -590,9 +590,9 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$stat
* if it's too late).
*/
var calendarEventClickCb = function (event, jsEvent, view) {
- $scope.selectedEvent = event
- return $scope.selectionTime = new Date()
- }
+ $scope.selectedEvent = event;
+ return $scope.selectionTime = new Date();
+ };
/**
* Triggered when fullCalendar tries to graphicaly render an event block.
@@ -601,13 +601,13 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$stat
*/
var eventRenderCb = function (event, element) {
if (($scope.currentUser.role === 'admin') && (event.tags.length > 0)) {
- let html = ''
+ let html = '';
for (let tag of Array.from(event.tags)) {
- html += `${tag.name}`
+ html += `${tag.name}`;
}
- element.find('.fc-time').append(html)
+ element.find('.fc-time').append(html);
}
- }
+ };
/**
* After payment, update the id of the newly reserved slot with the id returned by the server.
@@ -620,28 +620,28 @@ Application.Controllers.controller('ReserveMachineController', ['$scope', '$stat
var updateMachineSlot = function (slot, reservation, user) {
angular.forEach(reservation.slots, function (s) {
if (slot.start.isSame(s.start_at)) {
- slot.id = s.id
- return slot.user = user
+ slot.id = s.id;
+ return slot.user = user;
}
- })
- }
+ });
+ };
/**
* Update the calendar's display to render the new attributes of the events
*/
- var updateCalendar = function () { uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents') }
+ var updateCalendar = function () { uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents'); };
/**
* Asynchronously fetch the events from the API and refresh the calendar's view with these new events
*/
var refetchCalendar = function () {
$timeout(function () {
- uiCalendarConfig.calendars.calendar.fullCalendar('refetchEvents')
- return uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents')
- })
- }
+ uiCalendarConfig.calendars.calendar.fullCalendar('refetchEvents');
+ return uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents');
+ });
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/main_nav.js b/app/assets/javascripts/controllers/main_nav.js
index 180499f76..5ff186c88 100644
--- a/app/assets/javascripts/controllers/main_nav.js
+++ b/app/assets/javascripts/controllers/main_nav.js
@@ -8,7 +8,7 @@
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
/**
* Navigation controller. List the links availables in the left navigation pane and their icon.
@@ -48,14 +48,14 @@ Application.Controllers.controller('MainNavController', ['$scope', '$location',
linkIcon: 'th'
}
- ]
+ ];
if (!Fablab.withoutPlans) {
$scope.navLinks.push({
state: 'app.public.plans',
linkText: 'subscriptions',
linkIcon: 'credit-card'
- })
+ });
}
if (!Fablab.withoutSpaces) {
@@ -63,10 +63,10 @@ Application.Controllers.controller('MainNavController', ['$scope', '$location',
state: 'app.public.spaces_list',
linkText: 'reserve_a_space',
linkIcon: 'rocket'
- })
+ });
}
- Fablab.adminNavLinks = Fablab.adminNavLinks || []
+ Fablab.adminNavLinks = Fablab.adminNavLinks || [];
const adminNavLinks = [
{
state: 'app.admin.trainings',
@@ -123,16 +123,16 @@ Application.Controllers.controller('MainNavController', ['$scope', '$location',
linkText: 'open_api_clients',
linkIcon: 'cloud'
}
- ].concat(Fablab.adminNavLinks)
+ ].concat(Fablab.adminNavLinks);
- $scope.adminNavLinks = adminNavLinks
+ $scope.adminNavLinks = adminNavLinks;
if (!Fablab.withoutSpaces) {
return $scope.adminNavLinks.splice(7, 0, {
state: 'app.public.spaces_list',
linkText: 'manage_the_spaces',
linkIcon: 'rocket'
- })
+ });
}
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/members.js b/app/assets/javascripts/controllers/members.js
index da40c3c35..f29033892 100644
--- a/app/assets/javascripts/controllers/members.js
+++ b/app/assets/javascripts/controllers/members.js
@@ -11,7 +11,7 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
/**
* Controller used in the members listing page
@@ -20,37 +20,37 @@ Application.Controllers.controller('MembersController', ['$scope', 'Member', 'me
/* PRIVATE STATIC CONSTANTS */
// number of invoices loaded each time we click on 'load more...'
- const MEMBERS_PER_PAGE = 10
+ const MEMBERS_PER_PAGE = 10;
/* PUBLIC SCOPE */
// currently displayed page of members
- $scope.page = 1
+ $scope.page = 1;
// members list
- $scope.members = membersPromise
+ $scope.members = membersPromise;
// true when all members are loaded
- $scope.noMoreResults = false
+ $scope.noMoreResults = false;
/**
* Callback for the 'load more' button.
* Will load the next results of the current search, if any
*/
$scope.showNextMembers = function () {
- $scope.page += 1
+ $scope.page += 1;
return Member.query({
requested_attributes: '[profile]',
page: $scope.page,
size: MEMBERS_PER_PAGE
}, function (members) {
- $scope.members = $scope.members.concat(members)
+ $scope.members = $scope.members.concat(members);
if (!members[0] || (members[0].maxMembers <= $scope.members.length)) {
- return $scope.noMoreResults = true
+ return $scope.noMoreResults = true;
}
- })
- }
+ });
+ };
/* PRIVATE SCOPE */
@@ -59,15 +59,15 @@ Application.Controllers.controller('MembersController', ['$scope', 'Member', 'me
*/
const initialize = function () {
if (!membersPromise[0] || (membersPromise[0].maxMembers <= $scope.members.length)) {
- return $scope.noMoreResults = true
+ return $scope.noMoreResults = true;
}
- }
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
/**
* Controller used when editing the current user's profile
@@ -77,36 +77,36 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco
/* PUBLIC SCOPE */
// API URL where the form will be posted
- $scope.actionUrl = `/api/members/${$scope.currentUser.id}`
+ $scope.actionUrl = `/api/members/${$scope.currentUser.id}`;
// list of groups
- $scope.groups = groups.filter(g => !g.disabled)
+ $scope.groups = groups.filter(g => !g.disabled);
// Form action on the above URL
- $scope.method = 'patch'
+ $scope.method = 'patch';
// Current user's profile
- $scope.user = memberPromise
+ $scope.user = memberPromise;
// default : do not show the group changing form
$scope.group =
- { change: false }
+ { change: false };
// group ID of the current/selected user
- $scope.userGroup = memberPromise.group_id
+ $scope.userGroup = memberPromise.group_id;
// active authentication provider parameters
- $scope.activeProvider = activeProviderPromise
+ $scope.activeProvider = activeProviderPromise;
// allow the user to change his password except if he connect from an SSO
- $scope.preventPassword = false
+ $scope.preventPassword = false;
// mapping of fields to disable
- $scope.preventField = {}
+ $scope.preventField = {};
// Should the passord be modified?
$scope.password =
- { change: false }
+ { change: false };
// Angular-Bootstrap datepicker configuration for birthday
$scope.datePicker = {
@@ -115,7 +115,7 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco
options: {
startingDay: Fablab.weekStartingDay
}
- }
+ };
/**
* Return the group object, identified by the ID set in $scope.userGroup
@@ -123,36 +123,36 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco
$scope.getUserGroup = function () {
for (let group of Array.from($scope.groups)) {
if (group.id === $scope.userGroup) {
- return group
+ return group;
}
}
- }
+ };
/**
* Change the group of the current user to the one set in $scope.userGroup
*/
$scope.selectGroup = () =>
Member.update({ id: $scope.user.id }, { user: { group_id: $scope.userGroup } }, function (user) {
- $scope.user = user
- $rootScope.currentUser = user
- Auth._currentUser.group_id = user.group_id
- $scope.group.change = false
- return growl.success(_t('your_group_has_been_successfully_changed'))
+ $scope.user = user;
+ $rootScope.currentUser = user;
+ Auth._currentUser.group_id = user.group_id;
+ $scope.group.change = false;
+ return growl.success(_t('your_group_has_been_successfully_changed'));
}
, function (err) {
- growl.error(_t('an_unexpected_error_prevented_your_group_from_being_changed'))
- return console.error(err)
- })
+ growl.error(_t('an_unexpected_error_prevented_your_group_from_being_changed'));
+ return console.error(err);
+ });
/**
* Callback to diplay the datepicker as a dropdown when clicking on the input field
* @param $event {Object} jQuery event object
*/
$scope.openDatePicker = function ($event) {
- $event.preventDefault()
- $event.stopPropagation()
- return $scope.datePicker.opened = true
- }
+ $event.preventDefault();
+ $event.stopPropagation();
+ return $scope.datePicker.opened = true;
+ };
/**
* For use with ngUpload (https://github.com/twilson63/ngUpload).
@@ -163,7 +163,7 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco
*/
$scope.submited = function (content) {
if ((content.id == null)) {
- $scope.alerts = []
+ $scope.alerts = [];
return angular.forEach(content, (v, k) =>
angular.forEach(v, err =>
$scope.alerts.push({
@@ -171,18 +171,18 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco
type: 'danger'
})
)
- )
+ );
} else {
- $scope.currentUser.profile.user_avatar = content.profile.user_avatar
- Auth._currentUser.profile.user_avatar = content.profile.user_avatar
- $scope.currentUser.name = content.name
- Auth._currentUser.name = content.name
- $scope.currentUser = content
- Auth._currentUser = content
- $rootScope.currentUser = content
- return $state.go('app.public.home')
+ $scope.currentUser.profile.user_avatar = content.profile.user_avatar;
+ Auth._currentUser.profile.user_avatar = content.profile.user_avatar;
+ $scope.currentUser.name = content.name;
+ Auth._currentUser.name = content.name;
+ $scope.currentUser = content;
+ Auth._currentUser = content;
+ $rootScope.currentUser = content;
+ return $state.go('app.public.home');
}
- }
+ };
/**
* Ask for confirmation then delete the current user's account
@@ -195,22 +195,22 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco
return {
title: _t('confirmation_required'),
msg: _t('do_you_really_want_to_delete_your_account') + ' ' + _t('all_data_relative_to_your_projects_will_be_lost')
- }
+ };
}
}
}
, () => // cancel confirmed
Member.remove({ id: user.id }, () =>
Auth.logout().then(function () {
- $state.go('app.public.home')
- return growl.success(_t('your_user_account_has_been_successfully_deleted_goodbye'))
+ $state.go('app.public.home');
+ return growl.success(_t('your_user_account_has_been_successfully_deleted_goodbye'));
})
, function (error) {
- console.log(error)
- return growl.error(_t('an_error_occured_preventing_your_account_from_being_deleted'))
+ console.log(error);
+ return growl.error(_t('an_error_occured_preventing_your_account_from_being_deleted'));
})
- )
+ );
/**
* For use with 'ng-class', returns the CSS class name for the uploads previews.
@@ -219,11 +219,11 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco
*/
$scope.fileinputClass = function (v) {
if (v) {
- return 'fileinput-exists'
+ return 'fileinput-exists';
} else {
- return 'fileinput-new'
+ return 'fileinput-new';
}
- }
+ };
/**
* Check if the of the properties editable by the user are linked to the SSO
@@ -232,22 +232,22 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco
$scope.hasSsoFields = () =>
// if check if keys > 1 because there's a minimum of 1 mapping (id <-> provider-uid)
// so the user may want to edit his profile on the SSO if at least 2 mappings exists
- Object.keys($scope.preventField).length > 1
+ Object.keys($scope.preventField).length > 1;
/**
* Disconnect and re-connect the user to the SSO to force the synchronisation of the profile's data
*/
$scope.syncProfile = () =>
Auth.logout().then(function (oldUser) {
- Session.destroy()
- $rootScope.currentUser = null
- $rootScope.toCheckNotifications = false
+ Session.destroy();
+ $rootScope.currentUser = null;
+ $rootScope.toCheckNotifications = false;
$scope.notifications = {
total: 0,
unread: 0
- }
- return $window.location.href = $scope.activeProvider.link_to_sso_connect
- })
+ };
+ return $window.location.href = $scope.activeProvider.link_to_sso_connect;
+ });
/* PRIVATE SCOPE */
@@ -255,42 +255,42 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco
* Kind of constructor: these actions will be realized first when the controller is loaded
*/
const initialize = function () {
- CSRF.setMetaTags()
+ CSRF.setMetaTags();
// init the birth date to JS object
- $scope.user.profile.birthday = moment($scope.user.profile.birthday).toDate()
+ $scope.user.profile.birthday = moment($scope.user.profile.birthday).toDate();
if ($scope.activeProvider.providable_type !== 'DatabaseProvider') {
- $scope.preventPassword = true
+ $scope.preventPassword = true;
}
// bind fields protection with sso fields
- return angular.forEach(activeProviderPromise.mapping, map => $scope.preventField[map] = true)
- }
+ return angular.forEach(activeProviderPromise.mapping, map => $scope.preventField[map] = true);
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
/**
* Controller used on the public user's profile page (seeing another user's profile)
*/
Application.Controllers.controller('ShowProfileController', ['$scope', 'memberPromise', 'SocialNetworks', function ($scope, memberPromise, SocialNetworks) {
// Selected user's information
- $scope.user = memberPromise // DEPENDENCY WITH NAVINUM GAMIFICATION PLUGIN !!!!
+ $scope.user = memberPromise; // DEPENDENCY WITH NAVINUM GAMIFICATION PLUGIN !!!!
// List of social networks associated with this user and toggle 'show all' state
$scope.social = {
showAllLinks: false,
networks: SocialNetworks
- }
+ };
/* PRIVATE SCOPE */
/**
* Kind of constructor: these actions will be realized first when the controller is loaded
*/
- const initialize = () => $scope.social.networks = filterNetworks()
+ const initialize = () => $scope.social.networks = filterNetworks();
/**
* Filter social network or website that are associated with the profile of the user provided in promise
@@ -298,17 +298,17 @@ Application.Controllers.controller('ShowProfileController', ['$scope', 'memberPr
* @return {Array}
*/
var filterNetworks = function () {
- const networks = []
+ const networks = [];
for (let network of Array.from(SocialNetworks)) {
if ($scope.user.profile[network] && ($scope.user.profile[network].length > 0)) {
- networks.push(network)
+ networks.push(network);
}
}
- return networks
- }
+ return networks;
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/notifications.js b/app/assets/javascripts/controllers/notifications.js
index 255a43c4b..0ca61d34e 100644
--- a/app/assets/javascripts/controllers/notifications.js
+++ b/app/assets/javascripts/controllers/notifications.js
@@ -10,7 +10,7 @@
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
/**
* Controller used in notifications page
@@ -20,27 +20,27 @@ Application.Controllers.controller('NotificationsController', ['$scope', 'Notifi
/* PRIVATE STATIC CONSTANTS */
// Number of notifications added to the page when the user clicks on 'load next notifications'
- const NOTIFICATIONS_PER_PAGE = 15
+ const NOTIFICATIONS_PER_PAGE = 15;
/* PUBLIC SCOPE */
// Array containg the archived notifications (already read)
- $scope.notificationsRead = []
+ $scope.notificationsRead = [];
// Array containg the new notifications (not read)
- $scope.notificationsUnread = []
+ $scope.notificationsUnread = [];
// Total number of notifications for the current user
- $scope.total = 0
+ $scope.total = 0;
// Total number of unread notifications for the current user
- $scope.totalUnread = 0
+ $scope.totalUnread = 0;
// By default, the pagination mode is activated to limit the page size
- $scope.paginateActive = true
+ $scope.paginateActive = true;
// The currently displayed page number
- $scope.page = 1
+ $scope.page = 1;
/**
* Mark the provided notification as read, updating its status on the server and moving it
@@ -49,22 +49,22 @@ Application.Controllers.controller('NotificationsController', ['$scope', 'Notifi
* @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
$scope.markAsRead = function (notification, e) {
- e.preventDefault()
+ e.preventDefault();
return Notification.update({ id: notification.id }, {
id: notification.id,
is_read: true
}
, function (updatedNotif) {
// remove notif from unreads
- const index = $scope.notificationsUnread.indexOf(notification)
- $scope.notificationsUnread.splice(index, 1)
+ const index = $scope.notificationsUnread.indexOf(notification);
+ $scope.notificationsUnread.splice(index, 1);
// add update notif to read
- $scope.notificationsRead.push(updatedNotif)
+ $scope.notificationsRead.push(updatedNotif);
// update counters
- $scope.$parent.notifications.unread -= 1
- return $scope.totalUnread -= 1
- })
- }
+ $scope.$parent.notifications.unread -= 1;
+ return $scope.totalUnread -= 1;
+ });
+ };
/**
* Mark every unread notifications as read and move them for the unread list to to read array.
@@ -74,15 +74,15 @@ Application.Controllers.controller('NotificationsController', ['$scope', 'Notifi
, function () { // success
// add notifs to read
angular.forEach($scope.notificationsUnread, function (n) {
- n.is_read = true
- return $scope.notificationsRead.push(n)
- })
+ n.is_read = true;
+ return $scope.notificationsRead.push(n);
+ });
// clear unread
- $scope.notificationsUnread = []
+ $scope.notificationsUnread = [];
// update counters
- $scope.$parent.notifications.unread = 0
- return $scope.totalUnread = 0
- })
+ $scope.$parent.notifications.unread = 0;
+ return $scope.totalUnread = 0;
+ });
/**
* Request the server to retrieve the next notifications and add them
@@ -90,29 +90,29 @@ Application.Controllers.controller('NotificationsController', ['$scope', 'Notifi
*/
$scope.addMoreNotifications = function () {
Notification.query({ page: $scope.page }, function (notifications) {
- $scope.total = notifications.totals.total
- $scope.totalUnread = notifications.totals.unread
+ $scope.total = notifications.totals.total;
+ $scope.totalUnread = notifications.totals.unread;
angular.forEach(notifications.notifications, function (notif) {
if (notif.is_read) {
- return $scope.notificationsRead.push(notif)
+ return $scope.notificationsRead.push(notif);
} else {
- return $scope.notificationsUnread.push(notif)
+ return $scope.notificationsUnread.push(notif);
}
- })
- return $scope.paginateActive = (notifications.totals.total > ($scope.notificationsRead.length + $scope.notificationsUnread.length))
- })
+ });
+ return $scope.paginateActive = (notifications.totals.total > ($scope.notificationsRead.length + $scope.notificationsUnread.length));
+ });
- return $scope.page += 1
- }
+ return $scope.page += 1;
+ };
/* PRIVATE SCOPE */
/**
* Kind of constructor: these actions will be realized first when the controller is loaded
*/
- const initialize = () => $scope.addMoreNotifications()
+ const initialize = () => $scope.addMoreNotifications();
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/plans.js.erb b/app/assets/javascripts/controllers/plans.js.erb
index 8ac671560..35d947af8 100644
--- a/app/assets/javascripts/controllers/plans.js.erb
+++ b/app/assets/javascripts/controllers/plans.js.erb
@@ -10,69 +10,69 @@
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScope', '$state', '$uibModal', 'Auth', 'dialogs', 'growl', 'plansPromise', 'groupsPromise', 'Subscription', 'Member', 'subscriptionExplicationsPromise', '_t', 'Wallet', 'helpers',
function ($scope, $rootScope, $state, $uibModal, Auth, dialogs, growl, plansPromise, groupsPromise, Subscription, Member, subscriptionExplicationsPromise, _t, Wallet, helpers) {
/* PUBLIC SCOPE */
// list of groups
- $scope.groups = groupsPromise.filter(function (g) { return (g.slug !== 'admins') & !g.disabled })
+ $scope.groups = groupsPromise.filter(function (g) { return (g.slug !== 'admins') & !g.disabled; });
// default : do not show the group changing form
// group ID of the current/selected user
$scope.group = {
change: false,
id: null
- }
+ };
// list of plans, classified by group
- $scope.plansClassifiedByGroup = []
+ $scope.plansClassifiedByGroup = [];
for (var group of Array.from($scope.groups)) {
- const groupObj = { id: group.id, name: group.name, plans: [] }
+ const groupObj = { id: group.id, name: group.name, plans: [] };
for (let plan of Array.from(plansPromise)) {
- if (plan.group_id === group.id) { groupObj.plans.push(plan) }
+ if (plan.group_id === group.id) { groupObj.plans.push(plan); }
}
- $scope.plansClassifiedByGroup.push(groupObj)
+ $scope.plansClassifiedByGroup.push(groupObj);
}
// user to deal with
$scope.ctrl = {
member: null,
member_id: null
- }
+ };
// already subscribed plan of the current user
$scope.paid =
- { plan: null }
+ { plan: null };
// plan to subscribe (shopping cart)
- $scope.selectedPlan = null
+ $scope.selectedPlan = null;
// Discount coupon to apply to the basket, if any
$scope.coupon =
- { applied: null }
+ { applied: null };
// Storage for the total price (plan price + coupon, if any)
$scope.cart =
- { total: null }
+ { total: null };
// text that appears in the bottom-right box of the page (subscriptions rules details)
- $scope.subscriptionExplicationsAlert = subscriptionExplicationsPromise.setting.value
+ $scope.subscriptionExplicationsAlert = subscriptionExplicationsPromise.setting.value;
/**
* Callback to deal with the subscription of the user selected in the dropdown list instead of the current user's
* subscription. (admins only)
*/
$scope.updateMember = function () {
- $scope.selectedPlan = null
- $scope.paid.plan = null
- $scope.group.change = false
+ $scope.selectedPlan = null;
+ $scope.paid.plan = null;
+ $scope.group.change = false;
return Member.get({ id: $scope.ctrl.member.id }, function (member) {
- $scope.ctrl.member = member
- return $scope.group.id = $scope.ctrl.member.group_id
- })
- }
+ $scope.ctrl.member = member;
+ return $scope.group.id = $scope.ctrl.member.group_id;
+ });
+ };
/**
* Add the provided plan to the shopping basket
@@ -81,31 +81,31 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
$scope.selectPlan = function (plan) {
if ($scope.isAuthenticated()) {
if ($scope.selectedPlan !== plan) {
- $scope.selectedPlan = plan
- return updateCartPrice()
+ $scope.selectedPlan = plan;
+ return updateCartPrice();
} else {
- return $scope.selectedPlan = null
+ return $scope.selectedPlan = null;
}
} else {
- return $scope.login()
+ return $scope.login();
}
- }
+ };
/**
* Callback to trigger the payment process of the subscription
*/
$scope.openSubscribePlanModal = function () {
Wallet.getWalletByUser({ user_id: $scope.ctrl.member.id }, function (wallet) {
- const amountToPay = helpers.getAmountToPay($scope.cart.total, wallet.amount)
+ const amountToPay = helpers.getAmountToPay($scope.cart.total, wallet.amount);
if (($scope.currentUser.role !== 'admin') && (amountToPay > 0)) {
- return payByStripe()
+ return payByStripe();
} else {
if (($scope.currentUser.role === 'admin') || (amountToPay === 0)) {
- return payOnSite()
+ return payOnSite();
}
}
- })
- }
+ });
+ };
/**
* Return the group object, identified by the ID set in $scope.group.id
@@ -113,35 +113,35 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
$scope.getUserGroup = function () {
for (group of Array.from($scope.groups)) {
if (group.id === $scope.group.id) {
- return group
+ return group;
}
}
- }
+ };
/**
* Change the group of the current/selected user to the one set in $scope.group.id
*/
$scope.selectGroup = function () {
Member.update({ id: $scope.ctrl.member.id }, { user: { group_id: $scope.group.id } }, function (user) {
- $scope.ctrl.member = user
- $scope.group.change = false
+ $scope.ctrl.member = user;
+ $scope.group.change = false;
if ($scope.currentUser.role !== 'admin') {
- $rootScope.currentUser = user
- Auth._currentUser.group_id = user.group_id
- growl.success(_t('your_group_was_successfully_changed'))
+ $rootScope.currentUser = user;
+ Auth._currentUser.group_id = user.group_id;
+ growl.success(_t('your_group_was_successfully_changed'));
} else {
- growl.success(_t('the_user_s_group_was_successfully_changed'))
+ growl.success(_t('the_user_s_group_was_successfully_changed'));
}
}
, function (err) {
if ($scope.currentUser.role !== 'admin') {
- growl.error(_t('an_error_prevented_your_group_from_being_changed'))
+ growl.error(_t('an_error_prevented_your_group_from_being_changed'));
} else {
- growl.error(_t('an_error_prevented_to_change_the_user_s_group'))
+ growl.error(_t('an_error_prevented_to_change_the_user_s_group'));
}
- console.error(err)
- })
- }
+ console.error(err);
+ });
+ };
/**
* Return an enumerable meaninful string for the gender of the provider user
@@ -150,9 +150,9 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
*/
$scope.getGender = function (user) {
if (user && user.profile) {
- if (user.profile.gender === 'true') { return 'male' } else { return 'female' }
- } else { return 'other' }
- }
+ if (user.profile.gender === 'true') { return 'male'; } else { return 'female'; }
+ } else { return 'other'; }
+ };
/**
* Test if the provided date is in the future
@@ -160,13 +160,13 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
* @return {boolean}
*/
$scope.isInFuture = function (dateTime) {
- return (moment().diff(moment(dateTime)) < 0)
- }
+ return (moment().diff(moment(dateTime)) < 0);
+ };
/**
* To use as callback in Array.prototype.filter to get only enabled plans
*/
- $scope.filterDisabledPlans = function (plan) { return !plan.disabled }
+ $scope.filterDisabledPlans = function (plan) { return !plan.disabled; };
/* PRIVATE SCOPE */
@@ -176,21 +176,21 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
const initialize = function () {
if ($scope.currentUser) {
if ($scope.currentUser.role !== 'admin') {
- $scope.ctrl.member = $scope.currentUser
- $scope.paid.plan = $scope.currentUser.subscribed_plan
- $scope.group.id = $scope.currentUser.group_id
+ $scope.ctrl.member = $scope.currentUser;
+ $scope.paid.plan = $scope.currentUser.subscribed_plan;
+ $scope.group.id = $scope.currentUser.group_id;
}
}
- $scope.$on('devise:new-session', function (event, user) { $scope.ctrl.member = user })
+ $scope.$on('devise:new-session', function (event, user) { $scope.ctrl.member = user; });
// watch when a coupon is applied to re-compute the total price
return $scope.$watch('coupon.applied', function (newValue, oldValue) {
if ((newValue !== null) || (oldValue !== null)) {
- return updateCartPrice()
+ return updateCartPrice();
}
- })
- }
+ });
+ };
/**
* Compute the total amount for the current reservation according to the previously set parameters
@@ -199,21 +199,21 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
var updateCartPrice = function () {
// first we check that a user was selected
if (Object.keys($scope.ctrl.member).length > 0) {
- $scope.cart.total = $scope.selectedPlan.amount
+ $scope.cart.total = $scope.selectedPlan.amount;
// apply the coupon if any
if ($scope.coupon.applied) {
- let discount
+ let discount;
if ($scope.coupon.applied.type === 'percent_off') {
- discount = ($scope.cart.total * $scope.coupon.applied.percent_off) / 100
+ discount = ($scope.cart.total * $scope.coupon.applied.percent_off) / 100;
} else if ($scope.coupon.applied.type === 'amount_off') {
- discount = $scope.coupon.applied.amount_off
+ discount = $scope.coupon.applied.amount_off;
}
- return $scope.cart.total -= discount
+ return $scope.cart.total -= discount;
}
} else {
- return $scope.reserve.amountTotal = null
+ return $scope.reserve.amountTotal = null;
}
- }
+ };
/**
* Open a modal window which trigger the stripe payment process
@@ -223,30 +223,30 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
templateUrl: '<%= asset_path "stripe/payment_modal.html" %>',
size: 'md',
resolve: {
- selectedPlan () { return $scope.selectedPlan },
- member () { return $scope.ctrl.member },
- price () { return $scope.cart.total },
+ selectedPlan () { return $scope.selectedPlan; },
+ member () { return $scope.ctrl.member; },
+ price () { return $scope.cart.total; },
wallet () {
- return Wallet.getWalletByUser({ user_id: $scope.ctrl.member.id }).$promise
+ return Wallet.getWalletByUser({ user_id: $scope.ctrl.member.id }).$promise;
},
- coupon () { return $scope.coupon.applied }
+ coupon () { return $scope.coupon.applied; }
},
controller: ['$scope', '$uibModalInstance', '$state', 'selectedPlan', 'member', 'price', 'Subscription', 'CustomAsset', 'wallet', 'helpers', '$filter', 'coupon',
function ($scope, $uibModalInstance, $state, selectedPlan, member, price, Subscription, CustomAsset, wallet, helpers, $filter, coupon) {
// User's wallet amount
- $scope.walletAmount = wallet.amount
+ $scope.walletAmount = wallet.amount;
// Final price to pay by the user
- $scope.amount = helpers.getAmountToPay(price, wallet.amount)
+ $scope.amount = helpers.getAmountToPay(price, wallet.amount);
// The plan that the user is about to subscribe
- $scope.selectedPlan = selectedPlan
+ $scope.selectedPlan = selectedPlan;
// Used in wallet info template to interpolate some translations
- $scope.numberFilter = $filter('number')
+ $scope.numberFilter = $filter('number');
// retrieve the CGV
- CustomAsset.get({ name: 'cgv-file' }, function (cgv) { $scope.cgv = cgv.custom_asset })
+ CustomAsset.get({ name: 'cgv-file' }, function (cgv) { $scope.cgv = cgv.custom_asset; });
/**
* Callback for click on the 'proceed' button.
@@ -255,9 +255,9 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
*/
$scope.payment = function (status, response) {
if (response.error) {
- growl.error(response.error.message)
+ growl.error(response.error.message);
} else {
- $scope.attempting = true
+ $scope.attempting = true;
Subscription.save({
coupon_code: ((coupon ? coupon.code : undefined)),
subscription: {
@@ -267,26 +267,26 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
}
}
, function (data) { // success
- $uibModalInstance.close(data)
+ $uibModalInstance.close(data);
}
, function (data, status) { // failed
- $scope.alerts = []
- $scope.alerts.push({ msg: _t('an_error_occured_during_the_payment_process_please_try_again_later'), type: 'danger' })
- $scope.attempting = false
+ $scope.alerts = [];
+ $scope.alerts.push({ msg: _t('an_error_occured_during_the_payment_process_please_try_again_later'), type: 'danger' });
+ $scope.attempting = false;
}
- )
+ );
}
- }
+ };
}
]
}).result['finally'](null).then(function (subscription) {
- $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan)
- Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan)
- $scope.paid.plan = angular.copy($scope.selectedPlan)
- $scope.selectedPlan = null
- $scope.coupon.applied = null
- })
- }
+ $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan);
+ Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan);
+ $scope.paid.plan = angular.copy($scope.selectedPlan);
+ $scope.selectedPlan = null;
+ $scope.coupon.applied = null;
+ });
+ };
/**
* Open a modal window which trigger the local payment process
@@ -296,42 +296,42 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
templateUrl: '<%= asset_path "plans/payment_modal.html" %>',
size: 'sm',
resolve: {
- selectedPlan () { return $scope.selectedPlan },
- member () { return $scope.ctrl.member },
- price () { return $scope.cart.total },
+ selectedPlan () { return $scope.selectedPlan; },
+ member () { return $scope.ctrl.member; },
+ price () { return $scope.cart.total; },
wallet () {
- return Wallet.getWalletByUser({ user_id: $scope.ctrl.member.id }).$promise
+ return Wallet.getWalletByUser({ user_id: $scope.ctrl.member.id }).$promise;
},
- coupon () { return $scope.coupon.applied }
+ coupon () { return $scope.coupon.applied; }
},
controller: ['$scope', '$uibModalInstance', '$state', 'selectedPlan', 'member', 'price', 'Subscription', 'wallet', 'helpers', '$filter', 'coupon',
function ($scope, $uibModalInstance, $state, selectedPlan, member, price, Subscription, wallet, helpers, $filter, coupon) {
// user wallet amount
- $scope.walletAmount = wallet.amount
+ $scope.walletAmount = wallet.amount;
// subcription price, coupon subtracted if any
- $scope.price = price
+ $scope.price = price;
// price to pay
- $scope.amount = helpers.getAmountToPay($scope.price, wallet.amount)
+ $scope.amount = helpers.getAmountToPay($scope.price, wallet.amount);
// Used in wallet info template to interpolate some translations
- $scope.numberFilter = $filter('number')
+ $scope.numberFilter = $filter('number');
// The plan that the user is about to subscribe
- $scope.plan = selectedPlan
+ $scope.plan = selectedPlan;
// The member who is subscribing a plan
- $scope.member = member
+ $scope.member = member;
// Button label
if ($scope.amount > 0) {
- $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }, 'messageformat')
+ $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }, 'messageformat');
} else {
if ((price.price > 0) && ($scope.walletAmount === 0)) {
- $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')(price.price) }, 'messageformat')
+ $scope.validButtonName = _t('confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')(price.price) }, 'messageformat');
} else {
- $scope.validButtonName = _t('confirm')
+ $scope.validButtonName = _t('confirm');
}
}
@@ -340,7 +340,7 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
* Save the subscription to the API
*/
$scope.ok = function () {
- $scope.attempting = true
+ $scope.attempting = true;
Subscription.save({
coupon_code: ((coupon ? coupon.code : undefined)),
subscription: {
@@ -349,34 +349,34 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
}
}
, function (data) { // success
- $uibModalInstance.close(data)
+ $uibModalInstance.close(data);
}
, function (data, status) { // failed
- $scope.alerts = []
- $scope.alerts.push({ msg: _t('an_error_occured_during_the_payment_process_please_try_again_later'), type: 'danger' })
- $scope.attempting = false
+ $scope.alerts = [];
+ $scope.alerts.push({ msg: _t('an_error_occured_during_the_payment_process_please_try_again_later'), type: 'danger' });
+ $scope.attempting = false;
}
- )
- }
+ );
+ };
/**
* Callback for the 'cancel' button.
* Close the modal box.
*/
- $scope.cancel = function () { $uibModalInstance.dismiss('cancel') }
+ $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); };
}
]
}).result['finally'](null).then(function (reservation) {
- $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan)
- Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan)
- $scope.ctrl.member = null
- $scope.paid.plan = angular.copy($scope.selectedPlan)
- $scope.selectedPlan = null
- return $scope.coupon.applied = null
- })
- }
+ $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan);
+ Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan);
+ $scope.ctrl.member = null;
+ $scope.paid.plan = angular.copy($scope.selectedPlan);
+ $scope.selectedPlan = null;
+ return $scope.coupon.applied = null;
+ });
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/profile.js.erb b/app/assets/javascripts/controllers/profile.js.erb
index e10446295..e0c9a3602 100644
--- a/app/assets/javascripts/controllers/profile.js.erb
+++ b/app/assets/javascripts/controllers/profile.js.erb
@@ -11,41 +11,41 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
Application.Controllers.controller('CompleteProfileController', ['$scope', '$rootScope', '$state', '$window', '_t', 'growl', 'CSRF', 'Auth', 'Member', 'settingsPromise', 'activeProviderPromise', 'groupsPromise', 'cguFile', 'memberPromise', 'Session', 'dialogs', 'AuthProvider',
function ($scope, $rootScope, $state, $window, _t, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise, Session, dialogs, AuthProvider) {
/* PUBLIC SCOPE */
// API URL where the form will be posted
- $scope.actionUrl = `/api/members/${memberPromise.id}`
+ $scope.actionUrl = `/api/members/${memberPromise.id}`;
// Form action on the above URL
- $scope.method = 'patch'
+ $scope.method = 'patch';
// genre of the application name (eg. "_le_ Fablab" or "_la_ Fabrique")
- $scope.nameGenre = settingsPromise.name_genre
+ $scope.nameGenre = settingsPromise.name_genre;
// name of the current fablab application (eg. "Fablab de la Casemate")
- $scope.fablabName = settingsPromise.fablab_name
+ $scope.fablabName = settingsPromise.fablab_name;
// information from the current SSO provider
- $scope.activeProvider = activeProviderPromise
+ $scope.activeProvider = activeProviderPromise;
// list of user's groups (student/standard/...)
- $scope.groups = groupsPromise
+ $scope.groups = groupsPromise;
// current user, contains information retrieved from the SSO
- $scope.user = memberPromise
+ $scope.user = memberPromise;
// disallow the user to change his password as he connect from SSO
- $scope.preventPassword = true
+ $scope.preventPassword = true;
// mapping of fields to disable
- $scope.preventField = {}
+ $scope.preventField = {};
// CGU
- $scope.cgu = cguFile.custom_asset
+ $scope.cgu = cguFile.custom_asset;
// Angular-Bootstrap datepicker configuration for birthday
$scope.datePicker = {
@@ -54,17 +54,17 @@ Application.Controllers.controller('CompleteProfileController', ['$scope', '$roo
options: {
startingDay: Fablab.weekStartingDay
}
- }
+ };
/**
* Callback to diplay the datepicker as a dropdown when clicking on the input field
* @param $event {Object} jQuery event object
*/
$scope.openDatePicker = function ($event) {
- $event.preventDefault()
- $event.stopPropagation()
- return $scope.datePicker.opened = true
- }
+ $event.preventDefault();
+ $event.stopPropagation();
+ return $scope.datePicker.opened = true;
+ };
/**
* For use with ngUpload (https://github.com/twilson63/ngUpload).
@@ -75,26 +75,26 @@ Application.Controllers.controller('CompleteProfileController', ['$scope', '$roo
*/
$scope.submited = function (content) {
if ((content.id == null)) {
- $scope.alerts = []
+ $scope.alerts = [];
angular.forEach(content, function (v, k) {
angular.forEach(v, function (err) {
$scope.alerts.push({
msg: k + ': ' + err,
type: 'danger'
- })
- })
- })
+ });
+ });
+ });
} else {
- $scope.user.profile.user_avatar = content.profile.user_avatar
- Auth._currentUser.profile.user_avatar = content.profile.user_avatar
- $scope.user.name = content.name
- Auth._currentUser.name = content.name
- $scope.user = content
- Auth._currentUser = content
- $rootScope.currentUser = content
- return $state.go('app.public.home')
+ $scope.user.profile.user_avatar = content.profile.user_avatar;
+ Auth._currentUser.profile.user_avatar = content.profile.user_avatar;
+ $scope.user.name = content.name;
+ Auth._currentUser.name = content.name;
+ $scope.user = content;
+ Auth._currentUser = content;
+ $rootScope.currentUser = content;
+ return $state.go('app.public.home');
}
- }
+ };
/**
* For use with 'ng-class', returns the CSS class name for the uploads previews.
@@ -103,99 +103,99 @@ Application.Controllers.controller('CompleteProfileController', ['$scope', '$roo
*/
$scope.fileinputClass = function (v) {
if (v) {
- return 'fileinput-exists'
+ return 'fileinput-exists';
} else {
- return 'fileinput-new'
+ return 'fileinput-new';
}
- }
+ };
/**
* Merge the current user into the account with the given auth_token
*/
$scope.registerAuthToken = function () {
Member.merge({ id: $rootScope.currentUser.id }, { user: { auth_token: $scope.user.auth_token } }, function (user) {
- $scope.user = user
- Auth._currentUser = user
- $rootScope.currentUser = user
- $state.go('app.public.home')
+ $scope.user = user;
+ Auth._currentUser = user;
+ $rootScope.currentUser = user;
+ $state.go('app.public.home');
}
, function (err) {
if (err.data.error) {
- growl.error(err.data.error)
+ growl.error(err.data.error);
} else {
- growl.error(_t('an_unexpected_error_occurred_check_your_authentication_code'))
- console.error(err)
+ growl.error(_t('an_unexpected_error_occurred_check_your_authentication_code'));
+ console.error(err);
}
- })
- }
+ });
+ };
/**
* Return the email given by the SSO provider, parsed if needed
* @return {String} E-mail of the current user
*/
$scope.ssoEmail = function () {
- const { email } = memberPromise
+ const { email } = memberPromise;
if (email) {
- const duplicate = email.match(/^<([^>]+)>.{20}-duplicate$/)
+ const duplicate = email.match(/^<([^>]+)>.{20}-duplicate$/);
if (duplicate) {
- return duplicate[1]
+ return duplicate[1];
}
}
- return email
- }
+ return email;
+ };
/**
* Test if the user's mail is marked as duplicate
* @return {boolean}
*/
$scope.hasDuplicate = function () {
- const { email } = memberPromise
+ const { email } = memberPromise;
if (email) {
- return !(email.match(/^<([^>]+)>.{20}-duplicate$/) === null)
+ return !(email.match(/^<([^>]+)>.{20}-duplicate$/) === null);
}
- }
+ };
/**
* Ask for email confirmation and send the SSO merging token again
* @param event {Object} jQuery event object
*/
$scope.resendCode = function (event) {
- event.preventDefault()
- event.stopPropagation()
+ event.preventDefault();
+ event.stopPropagation();
dialogs.confirm(
{
templateUrl: '<%= asset_path "profile/resend_code_modal.html" %>',
resolve: {
object () {
- return { email: memberPromise.email }
+ return { email: memberPromise.email };
}
}
},
function (email) {
// Request the server to send an auth-migration email to the current user
AuthProvider.send_code({ email },
- function (res) { growl.info(_t('code_successfully_sent_again')) },
- function (err) { growl.error(err.data.error) }
- )
+ function (res) { growl.info(_t('code_successfully_sent_again')); },
+ function (err) { growl.error(err.data.error); }
+ );
}
- )
- }
+ );
+ };
/**
* Disconnect and re-connect the user to the SSO to force the synchronisation of the profile's data
*/
$scope.syncProfile = function () {
Auth.logout().then(function (oldUser) {
- Session.destroy()
- $rootScope.currentUser = null
- $rootScope.toCheckNotifications = false
+ Session.destroy();
+ $rootScope.currentUser = null;
+ $rootScope.toCheckNotifications = false;
$scope.notifications = {
total: 0,
unread: 0
- }
- $window.location.href = activeProviderPromise.link_to_sso_connect
- })
- }
+ };
+ $window.location.href = activeProviderPromise.link_to_sso_connect;
+ });
+ };
/* PRIVATE SCOPE */
@@ -203,17 +203,17 @@ Application.Controllers.controller('CompleteProfileController', ['$scope', '$roo
* Kind of constructor: these actions will be realized first when the controller is loaded
*/
const initialize = function () {
- CSRF.setMetaTags()
+ CSRF.setMetaTags();
// init the birth date to JS object
- $scope.user.profile.birthday = moment($scope.user.profile.birthday).toDate()
+ $scope.user.profile.birthday = moment($scope.user.profile.birthday).toDate();
// bind fields protection with sso fields
- angular.forEach(activeProviderPromise.mapping, function (map) { $scope.preventField[map] = true })
- }
+ angular.forEach(activeProviderPromise.mapping, function (map) { $scope.preventField[map] = true; });
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/projects.js.erb b/app/assets/javascripts/controllers/projects.js.erb
index b15c27ebe..538f298bd 100644
--- a/app/assets/javascripts/controllers/projects.js.erb
+++ b/app/assets/javascripts/controllers/projects.js.erb
@@ -13,7 +13,7 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
/* COMMON CODE */
@@ -49,9 +49,9 @@ class ProjectsController {
return ({
id: d.id,
name: d.name
- })
- })
- })
+ });
+ });
+ });
// Retrieve the list of components from the server
Component.query().$promise.then(function (data) {
@@ -59,9 +59,9 @@ class ProjectsController {
return ({
id: d.id,
name: d.name
- })
- })
- })
+ });
+ });
+ });
// Retrieve the list of themes from the server
Theme.query().$promise.then(function (data) {
@@ -69,9 +69,9 @@ class ProjectsController {
return ({
id: d.id,
name: d.name
- })
- })
- })
+ });
+ });
+ });
// Retrieve the list of licences from the server
Licence.query().$promise.then(function (data) {
@@ -79,15 +79,15 @@ class ProjectsController {
return ({
id: d.id,
name: d.name
- })
- })
- })
+ });
+ });
+ });
// Total number of documentation steps for the current project
- $scope.totalSteps = $scope.project.project_steps_attributes.length
+ $scope.totalSteps = $scope.project.project_steps_attributes.length;
// List of extensions allowed for CAD attachements upload
- $scope.allowedExtensions = allowedExtensions
+ $scope.allowedExtensions = allowedExtensions;
/**
* For use with ngUpload (https://github.com/twilson63/ngUpload).
@@ -97,21 +97,21 @@ class ProjectsController {
*/
$scope.submited = function (content) {
if ((content.id == null)) {
- $scope.alerts = []
+ $scope.alerts = [];
angular.forEach(content, function (v, k) {
angular.forEach(v, function (err) {
$scope.alerts.push({
msg: k + ': ' + err,
type: 'danger'
- })
- })
- })
+ });
+ });
+ });
// using https://github.com/oblador/angular-scroll
- $('section[ui-view=main]').scrollTop(0, 200)
+ $('section[ui-view=main]').scrollTop(0, 200);
} else {
- return $state.go('app.public.projects_show', { id: content.slug })
+ return $state.go('app.public.projects_show', { id: content.slug });
}
- }
+ };
/**
* For use with 'ng-class', returns the CSS class name for the uploads previews.
@@ -120,16 +120,16 @@ class ProjectsController {
*/
$scope.fileinputClass = function (v) {
if (v) {
- return 'fileinput-exists'
+ return 'fileinput-exists';
} else {
- return 'fileinput-new'
+ return 'fileinput-new';
}
- }
+ };
/**
* This will create a single new empty entry into the project's CAO attachements list.
*/
- $scope.addFile = function () { $scope.project.project_caos_attributes.push({}) }
+ $scope.addFile = function () { $scope.project.project_caos_attributes.push({}); };
/**
* This will remove the given file from the project's CAO attachements list. If the file was previously uploaded
@@ -138,21 +138,21 @@ class ProjectsController {
* @param file {Object} the file to delete
*/
$scope.deleteFile = function (file) {
- const index = $scope.project.project_caos_attributes.indexOf(file)
+ const index = $scope.project.project_caos_attributes.indexOf(file);
if (file.id != null) {
- return file._destroy = true
+ return file._destroy = true;
} else {
- return $scope.project.project_caos_attributes.splice(index, 1)
+ return $scope.project.project_caos_attributes.splice(index, 1);
}
- }
+ };
/**
* This will create a single new empty entry into the project's steps list.
*/
$scope.addStep = function () {
- $scope.totalSteps += 1
- return $scope.project.project_steps_attributes.push({ step_nb: $scope.totalSteps, project_step_images_attributes: [] })
- }
+ $scope.totalSteps += 1;
+ return $scope.project.project_steps_attributes.push({ step_nb: $scope.totalSteps, project_step_images_attributes: [] });
+ };
/**
* This will remove the given step from the project's steps list. If the step was previously saved
@@ -167,34 +167,34 @@ class ProjectsController {
return {
title: _t('confirmation_required'),
msg: _t('do_you_really_want_to_delete_this_step')
- }
+ };
}
}
}
, function () { // deletion confirmed
- const index = $scope.project.project_steps_attributes.indexOf(step)
+ const index = $scope.project.project_steps_attributes.indexOf(step);
if (step.id != null) {
- step._destroy = true
+ step._destroy = true;
} else {
- $scope.project.project_steps_attributes.splice(index, 1)
+ $scope.project.project_steps_attributes.splice(index, 1);
}
// update the new total number of steps
- $scope.totalSteps -= 1
+ $scope.totalSteps -= 1;
// reindex the remaining steps
return (function () {
- const result = []
+ const result = [];
for (let s of Array.from($scope.project.project_steps_attributes)) {
if (s.step_nb > step.step_nb) {
- result.push(s.step_nb -= 1)
+ result.push(s.step_nb -= 1);
} else {
- result.push(undefined)
+ result.push(undefined);
}
}
- return result
- })()
- })
- }
+ return result;
+ })();
+ });
+ };
/**
* Change the step_nb property of the given step to the new value provided. The step that was previously at this
@@ -204,34 +204,34 @@ class ProjectsController {
* @param newIdx {number} the new index to assign to the step
*/
$scope.changeStepIndex = function (event, step, newIdx) {
- if (event) { event.preventDefault() }
+ if (event) { event.preventDefault(); }
for (let s of Array.from($scope.project.project_steps_attributes)) {
if (s.step_nb === newIdx) {
- s.step_nb = step.step_nb
- step.step_nb = newIdx
- break
+ s.step_nb = step.step_nb;
+ step.step_nb = newIdx;
+ break;
}
}
- return false
- }
+ return false;
+ };
$scope.autoCompleteName = function (nameLookup) {
if (!nameLookup) {
- return
+ return;
}
- const asciiName = Diacritics.remove(nameLookup)
+ const asciiName = Diacritics.remove(nameLookup);
Member.search(
{ query: asciiName },
- function (users) { $scope.matchingMembers = users },
- function (error) { console.error(error) }
- )
- }
+ function (users) { $scope.matchingMembers = users; },
+ function (error) { console.error(error); }
+ );
+ };
/**
* This will create a single new empty entry into the project's step image list.
*/
- $scope.addProjectStepImage = function (step) { step.project_step_images_attributes.push({}) }
+ $scope.addProjectStepImage = function (step) { step.project_step_images_attributes.push({}); };
/**
* This will remove the given image from the project's step image list.
@@ -239,13 +239,13 @@ class ProjectsController {
* @param image {Object} the image to delete
*/
$scope.deleteProjectStepImage = function (step, image) {
- const index = step.project_step_images_attributes.indexOf(image)
+ const index = step.project_step_images_attributes.indexOf(image);
if (image.id != null) {
- return image._destroy = true
+ return image._destroy = true;
} else {
- return step.project_step_images_attributes.splice(index, 1)
+ return step.project_step_images_attributes.splice(index, 1);
}
- }
+ };
}
}
@@ -257,18 +257,18 @@ Application.Controllers.controller('ProjectsController', ['$scope', '$state', 'P
/* PRIVATE STATIC CONSTANTS */
// Number of projects added to the page when the user clicks on 'load more projects'
- const PROJECTS_PER_PAGE = 16
+ const PROJECTS_PER_PAGE = 16;
/* PUBLIC SCOPE */
// Fab-manager's instance ID in the openLab network
- $scope.openlabAppId = Fablab.openlabAppId
+ $scope.openlabAppId = Fablab.openlabAppId;
// Is openLab enabled on the instance?
$scope.openlab = {
projectsActive: Fablab.openlabProjectsActive,
searchOverWholeNetwork: false
- }
+ };
// default search parameters
$scope.search = {
@@ -277,69 +277,69 @@ Application.Controllers.controller('ProjectsController', ['$scope', '$state', 'P
machine_id: (parseInt($location.$$search.machine_id) || undefined),
component_id: (parseInt($location.$$search.component_id) || undefined),
theme_id: (parseInt($location.$$search.theme_id) || undefined)
- }
+ };
// list of projects to display
- $scope.projects = []
+ $scope.projects = [];
// list of machines / used for filtering
- $scope.machines = machinesPromise
+ $scope.machines = machinesPromise;
// list of themes / used for filtering
- $scope.themes = themesPromise
+ $scope.themes = themesPromise;
// list of components / used for filtering
- $scope.components = componentsPromise
+ $scope.components = componentsPromise;
$scope.searchOverWholeNetworkChanged = function () {
setTimeout(
- function () { $scope.resetFiltersAndTriggerSearch() },
+ function () { $scope.resetFiltersAndTriggerSearch(); },
150
- )
- }
+ );
+ };
$scope.loadMore = function () {
if ($scope.openlab.searchOverWholeNetwork === true) {
- return $scope.projectsPagination.loadMore({ q: $scope.search.q })
+ return $scope.projectsPagination.loadMore({ q: $scope.search.q });
} else {
- return $scope.projectsPagination.loadMore({ search: $scope.search })
+ return $scope.projectsPagination.loadMore({ search: $scope.search });
}
- }
+ };
$scope.resetFiltersAndTriggerSearch = function () {
- $scope.search.q = ''
- $scope.search.from = undefined
- $scope.search.machine_id = undefined
- $scope.search.component_id = undefined
- $scope.search.theme_id = undefined
- $scope.setUrlQueryParams($scope.search)
- return $scope.triggerSearch()
- }
+ $scope.search.q = '';
+ $scope.search.from = undefined;
+ $scope.search.machine_id = undefined;
+ $scope.search.component_id = undefined;
+ $scope.search.theme_id = undefined;
+ $scope.setUrlQueryParams($scope.search);
+ return $scope.triggerSearch();
+ };
$scope.triggerSearch = function () {
- const currentPage = parseInt($location.$$search.page) || 1
+ const currentPage = parseInt($location.$$search.page) || 1;
if ($scope.openlab.searchOverWholeNetwork === true) {
- updateUrlParam('whole_network', 't')
- $scope.projectsPagination = new paginationService.Instance(OpenlabProject, currentPage, PROJECTS_PER_PAGE, null, { }, loadMoreOpenlabCallback)
+ updateUrlParam('whole_network', 't');
+ $scope.projectsPagination = new paginationService.Instance(OpenlabProject, currentPage, PROJECTS_PER_PAGE, null, { }, loadMoreOpenlabCallback);
return OpenlabProject.query({ q: $scope.search.q, page: currentPage, per_page: PROJECTS_PER_PAGE }, function (projectsPromise) {
if (projectsPromise.errors != null) {
- growl.error(_t('openlab_search_not_available_at_the_moment'))
- $scope.openlab.searchOverWholeNetwork = false
- return $scope.triggerSearch()
+ growl.error(_t('openlab_search_not_available_at_the_moment'));
+ $scope.openlab.searchOverWholeNetwork = false;
+ return $scope.triggerSearch();
} else {
- $scope.projectsPagination.totalCount = projectsPromise.meta.total
- return $scope.projects = normalizeProjectsAttrs(projectsPromise.projects)
+ $scope.projectsPagination.totalCount = projectsPromise.meta.total;
+ return $scope.projects = normalizeProjectsAttrs(projectsPromise.projects);
}
- })
+ });
} else {
- updateUrlParam('whole_network', 'f')
- $scope.projectsPagination = new paginationService.Instance(Project, currentPage, PROJECTS_PER_PAGE, null, { }, loadMoreCallback, 'search')
+ updateUrlParam('whole_network', 'f');
+ $scope.projectsPagination = new paginationService.Instance(Project, currentPage, PROJECTS_PER_PAGE, null, { }, loadMoreCallback, 'search');
return Project.search({ search: $scope.search, page: currentPage, per_page: PROJECTS_PER_PAGE }, function (projectsPromise) {
- $scope.projectsPagination.totalCount = projectsPromise.meta.total
- return $scope.projects = projectsPromise.projects
- })
+ $scope.projectsPagination.totalCount = projectsPromise.meta.total;
+ return $scope.projects = projectsPromise.projects;
+ });
}
- }
+ };
/**
* Callback to switch the user's view to the detailled project page
@@ -347,24 +347,24 @@ Application.Controllers.controller('ProjectsController', ['$scope', '$state', 'P
*/
$scope.showProject = function (project) {
if (($scope.openlab.searchOverWholeNetwork === true) && (project.app_id !== Fablab.openlabAppId)) {
- $window.open(project.project_url, '_blank')
- return true
+ $window.open(project.project_url, '_blank');
+ return true;
} else {
- return $state.go('app.public.projects_show', { id: project.slug })
+ return $state.go('app.public.projects_show', { id: project.slug });
}
- }
+ };
/**
* function to set all url query search parameters from search object
*/
$scope.setUrlQueryParams = function (search) {
- updateUrlParam('page', 1)
- updateUrlParam('q', search.q)
- updateUrlParam('from', search.from)
- updateUrlParam('theme_id', search.theme_id)
- updateUrlParam('component_id', search.component_id)
- return updateUrlParam('machine_id', search.machine_id)
- }
+ updateUrlParam('page', 1);
+ updateUrlParam('q', search.q);
+ updateUrlParam('from', search.from);
+ updateUrlParam('theme_id', search.theme_id);
+ updateUrlParam('component_id', search.component_id);
+ return updateUrlParam('machine_id', search.machine_id);
+ };
/* PRIVATE SCOPE */
@@ -373,98 +373,98 @@ Application.Controllers.controller('ProjectsController', ['$scope', '$state', 'P
*/
const initialize = function () {
if ($location.$$search.whole_network === 'f') {
- $scope.openlab.searchOverWholeNetwork = false
+ $scope.openlab.searchOverWholeNetwork = false;
} else {
- $scope.openlab.searchOverWholeNetwork = $scope.openlab.projectsActive || false
+ $scope.openlab.searchOverWholeNetwork = $scope.openlab.projectsActive || false;
}
- return $scope.triggerSearch()
- }
+ return $scope.triggerSearch();
+ };
/**
* function to update url query param, little hack to turn off reloadOnSearch and re-enable it after setting the params
* params example: 'q' , 'presse-purée'
*/
var updateUrlParam = function (name, value) {
- $state.current.reloadOnSearch = false
- $location.search(name, value)
- return $timeout(function () { $state.current.reloadOnSearch = undefined })
- }
+ $state.current.reloadOnSearch = false;
+ $location.search(name, value);
+ return $timeout(function () { $state.current.reloadOnSearch = undefined; });
+ };
var loadMoreCallback = function (projectsPromise) {
- $scope.projects = $scope.projects.concat(projectsPromise.projects)
- return updateUrlParam('page', $scope.projectsPagination.currentPage)
- }
+ $scope.projects = $scope.projects.concat(projectsPromise.projects);
+ return updateUrlParam('page', $scope.projectsPagination.currentPage);
+ };
var loadMoreOpenlabCallback = function (projectsPromise) {
- $scope.projects = $scope.projects.concat(normalizeProjectsAttrs(projectsPromise.projects))
- return updateUrlParam('page', $scope.projectsPagination.currentPage)
- }
+ $scope.projects = $scope.projects.concat(normalizeProjectsAttrs(projectsPromise.projects));
+ return updateUrlParam('page', $scope.projectsPagination.currentPage);
+ };
var normalizeProjectsAttrs = function (projects) {
projects.map(function (project) {
- project.project_image = project.image_url
- return project
- })
- }
+ project.project_image = project.image_url;
+ return project;
+ });
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
/**
* Controller used in the project creation page
*/
Application.Controllers.controller('NewProjectController', ['$scope', '$state', 'Project', 'Machine', 'Member', 'Component', 'Theme', 'Licence', '$document', 'CSRF', 'Diacritics', 'dialogs', 'allowedExtensions', '_t',
function ($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, CSRF, Diacritics, dialogs, allowedExtensions, _t) {
- CSRF.setMetaTags()
+ CSRF.setMetaTags();
// API URL where the form will be posted
- $scope.actionUrl = '/api/projects/'
+ $scope.actionUrl = '/api/projects/';
// Form action on the above URL
- $scope.method = 'post'
+ $scope.method = 'post';
// Default project parameters
$scope.project = {
project_steps_attributes: [],
project_caos_attributes: []
- }
+ };
- $scope.matchingMembers = []
+ $scope.matchingMembers = [];
// Using the ProjectsController
- return new ProjectsController($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, Diacritics, dialogs, allowedExtensions, _t)
+ return new ProjectsController($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, Diacritics, dialogs, allowedExtensions, _t);
}
-])
+]);
/**
* Controller used in the project edition page
*/
Application.Controllers.controller('EditProjectController', ['$scope', '$state', '$stateParams', 'Project', 'Machine', 'Member', 'Component', 'Theme', 'Licence', '$document', 'CSRF', 'projectPromise', 'Diacritics', 'dialogs', 'allowedExtensions', '_t',
function ($scope, $state, $stateParams, Project, Machine, Member, Component, Theme, Licence, $document, CSRF, projectPromise, Diacritics, dialogs, allowedExtensions, _t) {
- CSRF.setMetaTags()
+ CSRF.setMetaTags();
// API URL where the form will be posted
- $scope.actionUrl = `/api/projects/${$stateParams.id}`
+ $scope.actionUrl = `/api/projects/${$stateParams.id}`;
// Form action on the above URL
- $scope.method = 'put'
+ $scope.method = 'put';
// Retrieve the project's details, if an error occured, redirect the user to the projects list page
- $scope.project = projectPromise
+ $scope.project = projectPromise;
$scope.matchingMembers = $scope.project.project_users.map(function (u) {
return ({
id: u.id,
name: u.full_name
- })
- })
+ });
+ });
// Using the ProjectsController
- return new ProjectsController($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, Diacritics, dialogs, allowedExtensions, _t)
+ return new ProjectsController($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, Diacritics, dialogs, allowedExtensions, _t);
}
-])
+]);
/**
* Controller used in the public project's details page
@@ -474,9 +474,9 @@ Application.Controllers.controller('ShowProjectController', ['$scope', '$state',
/* PUBLIC SCOPE */
// Store the project's details
- $scope.project = projectPromise
- $scope.projectUrl = $location.absUrl()
- $scope.disqusShortname = Fablab.disqusShortname
+ $scope.project = projectPromise;
+ $scope.projectUrl = $location.absUrl();
+ $scope.disqusShortname = Fablab.disqusShortname;
/**
* Test if the provided user has the edition rights on the current project
@@ -484,14 +484,14 @@ Application.Controllers.controller('ShowProjectController', ['$scope', '$state',
* @returns boolean
*/
$scope.projectEditableBy = function (user) {
- if ((user == null)) { return false }
- if ($scope.project.author_id === user.id) { return true }
- let canEdit = false
+ if ((user == null)) { return false; }
+ if ($scope.project.author_id === user.id) { return true; }
+ let canEdit = false;
angular.forEach($scope.project.project_users, function (u) {
- if ((u.id === user.id) && u.is_valid) { return canEdit = true }
- })
- return canEdit
- }
+ if ((u.id === user.id) && u.is_valid) { return canEdit = true; }
+ });
+ return canEdit;
+ };
/**
* Test if the provided user has the deletion rights on the current project
@@ -499,9 +499,9 @@ Application.Controllers.controller('ShowProjectController', ['$scope', '$state',
* @returns boolean
*/
$scope.projectDeletableBy = function (user) {
- if ((user == null)) { return false }
- if ($scope.project.author_id === user.id) { return true }
- }
+ if ((user == null)) { return false; }
+ if ($scope.project.author_id === user.id) { return true; }
+ };
/**
* Callback to delete the current project. Then, the user is redirected to the projects list page,
@@ -517,40 +517,40 @@ Application.Controllers.controller('ShowProjectController', ['$scope', '$state',
return {
title: _t('confirmation_required'),
msg: _t('do_you_really_want_to_delete_this_project')
- }
+ };
}
}
}
, function () { // cancel confirmed
- $scope.project.$delete(function () { $state.go('app.public.projects_list', {}, { reload: true }) })
- })
+ $scope.project.$delete(function () { $state.go('app.public.projects_list', {}, { reload: true }); });
+ });
} else {
- return console.error(_t('unauthorized_operation'))
+ return console.error(_t('unauthorized_operation'));
}
- }
+ };
/**
* Open a modal box containg a form that allow the end-user to signal an abusive content
* @param e {Object} jQuery event
*/
$scope.signalAbuse = function (e) {
- if (e) { e.preventDefault() }
+ if (e) { e.preventDefault(); }
$uibModal.open({
templateUrl: '<%= asset_path "shared/signalAbuseModal.html" %>',
size: 'md',
resolve: {
- project () { return $scope.project }
+ project () { return $scope.project; }
},
controller: ['$scope', '$uibModalInstance', '_t', 'growl', 'Abuse', 'project', function ($scope, $uibModalInstance, _t, growl, Abuse, project) {
// signaler's profile & signalement infos
$scope.signaler = {
signaled_type: 'Project',
signaled_id: project.id
- }
+ };
// callback for signaling cancellation
- $scope.cancel = function () { $uibModalInstance.dismiss('cancel') }
+ $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); };
// callback for form validation
return $scope.ok = function () {
@@ -559,27 +559,27 @@ Application.Controllers.controller('ShowProjectController', ['$scope', '$state',
{ abuse: $scope.signaler },
function (res) {
// creation successful
- growl.success(_t('your_report_was_successful_thanks'))
- return $uibModalInstance.close(res)
+ growl.success(_t('your_report_was_successful_thanks'));
+ return $uibModalInstance.close(res);
}
, function (error) {
// creation failed...
- growl.error(_t('an_error_occured_while_sending_your_report'))
+ growl.error(_t('an_error_occured_while_sending_your_report'));
}
- )
- }
+ );
+ };
}]
- })
- }
+ });
+ };
/**
* Return the URL allowing to share the current project on the Facebook social network
*/
- $scope.shareOnFacebook = function () { return `https://www.facebook.com/share.php?u=${$state.href('app.public.projects_show', { id: $scope.project.slug }, { absolute: true }).replace('#', '%23')}` }
+ $scope.shareOnFacebook = function () { return `https://www.facebook.com/share.php?u=${$state.href('app.public.projects_show', { id: $scope.project.slug }, { absolute: true }).replace('#', '%23')}`; };
/**
* Return the URL allowing to share the current project on the Twitter social network
*/
- $scope.shareOnTwitter = function () { return `https://twitter.com/intent/tweet?url=${encodeURIComponent($state.href('app.public.projects_show', { id: $scope.project.slug }, { absolute: true }))}&text=${encodeURIComponent($scope.project.name)}` }
+ $scope.shareOnTwitter = function () { return `https://twitter.com/intent/tweet?url=${encodeURIComponent($state.href('app.public.projects_show', { id: $scope.project.slug }, { absolute: true }))}&text=${encodeURIComponent($scope.project.name)}`; };
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/spaces.js.erb b/app/assets/javascripts/controllers/spaces.js.erb
index 65c0c97ae..113144cb7 100644
--- a/app/assets/javascripts/controllers/spaces.js.erb
+++ b/app/assets/javascripts/controllers/spaces.js.erb
@@ -41,24 +41,24 @@ class SpacesController {
*/
$scope.submited = function (content) {
if ((content.id == null)) {
- $scope.alerts = []
+ $scope.alerts = [];
angular.forEach(content, function (v, k) {
angular.forEach(v, function (err) {
$scope.alerts.push({
msg: k + ': ' + err,
type: 'danger'
- })
- })
- })
+ });
+ });
+ });
} else {
- $state.go('app.public.spaces_list')
+ $state.go('app.public.spaces_list');
}
- }
+ };
/**
* Changes the current user's view, redirecting him to the spaces list
*/
- $scope.cancel = function () { $state.go('app.public.spaces_list') }
+ $scope.cancel = function () { $state.go('app.public.spaces_list'); };
/**
* For use with 'ng-class', returns the CSS class name for the uploads previews.
@@ -67,16 +67,16 @@ class SpacesController {
*/
$scope.fileinputClass = function (v) {
if (v) {
- return 'fileinput-exists'
+ return 'fileinput-exists';
} else {
- return 'fileinput-new'
+ return 'fileinput-new';
}
- }
+ };
/**
* This will create a single new empty entry into the space attachments list.
*/
- $scope.addFile = function () { $scope.space.space_files_attributes.push({}) }
+ $scope.addFile = function () { $scope.space.space_files_attributes.push({}); };
/**
* This will remove the given file from the space attachments list. If the file was previously uploaded
@@ -85,13 +85,13 @@ class SpacesController {
* @param file {Object} the file to delete
*/
$scope.deleteFile = function (file) {
- const index = $scope.space.space_files_attributes.indexOf(file)
+ const index = $scope.space.space_files_attributes.indexOf(file);
if (file.id != null) {
- return file._destroy = true
+ return file._destroy = true;
} else {
- return $scope.space.space_files_attributes.splice(index, 1)
+ return $scope.space.space_files_attributes.splice(index, 1);
}
- }
+ };
}
}
@@ -100,92 +100,92 @@ class SpacesController {
*/
Application.Controllers.controller('SpacesController', ['$scope', '$state', 'spacesPromise', function ($scope, $state, spacesPromise) {
// Retrieve the list of spaces
- $scope.spaces = spacesPromise
+ $scope.spaces = spacesPromise;
/**
* Redirect the user to the space details page
*/
- $scope.showSpace = function (space) { $state.go('app.public.space_show', { id: space.slug }) }
+ $scope.showSpace = function (space) { $state.go('app.public.space_show', { id: space.slug }); };
/**
* Callback to book a reservation for the current space
*/
- $scope.reserveSpace = function (space) { $state.go('app.logged.space_reserve', { id: space.slug }) }
+ $scope.reserveSpace = function (space) { $state.go('app.logged.space_reserve', { id: space.slug }); };
// Default: we show only enabled spaces
- $scope.spaceFiltering = 'enabled'
+ $scope.spaceFiltering = 'enabled';
// Available options for filtering spaces by status
$scope.filterDisabled = [
'enabled',
'disabled',
'all'
- ]
-}])
+ ];
+}]);
/**
* Controller used in the space creation page (admin)
*/
Application.Controllers.controller('NewSpaceController', ['$scope', '$state', 'CSRF', function ($scope, $state, CSRF) {
- CSRF.setMetaTags()
+ CSRF.setMetaTags();
// API URL where the form will be posted
- $scope.actionUrl = '/api/spaces/'
+ $scope.actionUrl = '/api/spaces/';
// Form action on the above URL
- $scope.method = 'post'
+ $scope.method = 'post';
// default space parameters
$scope.space =
- { space_files_attributes: [] }
+ { space_files_attributes: [] };
// Using the SpacesController
- return new SpacesController($scope, $state)
-}])
+ return new SpacesController($scope, $state);
+}]);
/**
* Controller used in the space edition page (admin)
*/
Application.Controllers.controller('EditSpaceController', ['$scope', '$state', '$stateParams', 'spacePromise', 'CSRF',
function ($scope, $state, $stateParams, spacePromise, CSRF) {
- CSRF.setMetaTags()
+ CSRF.setMetaTags();
// API URL where the form will be posted
- $scope.actionUrl = `/api/spaces/${$stateParams.id}`
+ $scope.actionUrl = `/api/spaces/${$stateParams.id}`;
// Form action on the above URL
- $scope.method = 'put'
+ $scope.method = 'put';
// space to modify
- $scope.space = spacePromise
+ $scope.space = spacePromise;
// Using the SpacesController
- return new SpacesController($scope, $state)
- }])
+ return new SpacesController($scope, $state);
+ }]);
Application.Controllers.controller('ShowSpaceController', ['$scope', '$state', 'spacePromise', '_t', 'dialogs', 'growl',
function ($scope, $state, spacePromise, _t, dialogs, growl) {
// Details of the space witch id/slug is provided in the URL
- $scope.space = spacePromise
+ $scope.space = spacePromise;
/**
* Callback to book a reservation for the current space
* @param event {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
$scope.reserveSpace = function (event) {
- event.preventDefault()
- return $state.go('app.logged.space_reserve', { id: $scope.space.slug })
- }
+ event.preventDefault();
+ return $state.go('app.logged.space_reserve', { id: $scope.space.slug });
+ };
/**
* Callback to book a reservation for the current space
* @param event {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
$scope.deleteSpace = function (event) {
- event.preventDefault()
+ event.preventDefault();
// check the permissions
if ($scope.currentUser.role !== 'admin') {
- return console.error(_t('space_show.unauthorized_operation'))
+ return console.error(_t('space_show.unauthorized_operation'));
} else {
return dialogs.confirm({
resolve: {
@@ -193,7 +193,7 @@ Application.Controllers.controller('ShowSpaceController', ['$scope', '$state', '
return {
title: _t('space_show.confirmation_required'),
msg: _t('space_show.do_you_really_want_to_delete_this_space')
- }
+ };
}
}
}
@@ -201,17 +201,17 @@ Application.Controllers.controller('ShowSpaceController', ['$scope', '$state', '
// delete the machine then redirect to the machines listing
$scope.space.$delete(
function () {
- $state.go('app.public.spaces_list')
+ $state.go('app.public.spaces_list');
},
function (error) {
- growl.warning(_t('space_show.the_space_cant_be_deleted_because_it_is_already_reserved_by_some_users'))
- console.error(error)
+ growl.warning(_t('space_show.the_space_cant_be_deleted_because_it_is_already_reserved_by_some_users'));
+ console.error(error);
}
- )
- })
+ );
+ });
}
- }
- }])
+ };
+ }]);
/**
* Controller used in the spaces reservation agenda page.
@@ -224,31 +224,31 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$stateP
/* PRIVATE STATIC CONSTANTS */
// Color of the selected event backgound
- const SELECTED_EVENT_BG_COLOR = '#ffdd00'
+ const SELECTED_EVENT_BG_COLOR = '#ffdd00';
// Slot free to be booked
- const FREE_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::SPACE_COLOR %>'
+ const FREE_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::SPACE_COLOR %>';
// Slot with reservation from current user
- const RESERVED_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::IS_RESERVED_BY_CURRENT_USER %>'
+ const RESERVED_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::IS_RESERVED_BY_CURRENT_USER %>';
/* PUBLIC SCOPE */
// bind the spaces availabilities with full-Calendar events
- $scope.eventSources = [ { events: availabilitySpacesPromise, textColor: 'black' } ]
+ $scope.eventSources = [ { events: availabilitySpacesPromise, textColor: 'black' } ];
// the user to deal with, ie. the current user for non-admins
$scope.ctrl =
- { member: {} }
+ { member: {} };
// list of plans, classified by group
- $scope.plansClassifiedByGroup = []
+ $scope.plansClassifiedByGroup = [];
for (let group of Array.from(groupsPromise)) {
- const groupObj = { id: group.id, name: group.name, plans: [] }
+ const groupObj = { id: group.id, name: group.name, plans: [] };
for (let plan of Array.from(plansPromise)) {
- if (plan.group_id === group.id) { groupObj.plans.push(plan) }
+ if (plan.group_id === group.id) { groupObj.plans.push(plan); }
}
- $scope.plansClassifiedByGroup.push(groupObj)
+ $scope.plansClassifiedByGroup.push(groupObj);
}
// mapping of fullCalendar events.
@@ -258,135 +258,135 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$stateP
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: *}
- }
+ };
// the moment when the slot selection changed for the last time, used to trigger changes in the cart
- $scope.selectionTime = null
+ $scope.selectionTime = null;
// the last clicked event in the calender
- $scope.selectedEvent = null
+ $scope.selectedEvent = null;
// indicates the state of the current view : calendar or plans information
- $scope.plansAreShown = false
+ $scope.plansAreShown = false;
// will store the user's plan if he choosed to buy one
- $scope.selectedPlan = null
+ $scope.selectedPlan = null;
// the moment when the plan selection changed for the last time, used to trigger changes in the cart
- $scope.planSelectionTime = null
+ $scope.planSelectionTime = null;
// Selected space
- $scope.space = spacePromise
+ $scope.space = spacePromise;
// fullCalendar (v2) configuration
$scope.calendarConfig = CalendarConfig({
minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')),
maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')),
eventClick (event, jsEvent, view) {
- return calendarEventClickCb(event, jsEvent, view)
+ return calendarEventClickCb(event, jsEvent, view);
},
eventRender (event, element, view) {
- return eventRenderCb(event, element, view)
+ return eventRenderCb(event, element, view);
}
- })
+ });
// Application global settings
- $scope.settings = settingsPromise
+ $scope.settings = settingsPromise;
// Global config: message to the end user concerning the subscriptions rules
- $scope.subscriptionExplicationsAlert = settingsPromise.subscription_explications_alert
+ $scope.subscriptionExplicationsAlert = settingsPromise.subscription_explications_alert;
// Global config: message to the end user concerning the space reservation
- $scope.spaceExplicationsAlert = settingsPromise.space_explications_alert
+ $scope.spaceExplicationsAlert = settingsPromise.space_explications_alert;
/**
* Change the last selected slot's appearence to looks like 'added to cart'
*/
$scope.markSlotAsAdded = function () {
- $scope.selectedEvent.backgroundColor = SELECTED_EVENT_BG_COLOR
- return updateCalendar()
- }
+ $scope.selectedEvent.backgroundColor = SELECTED_EVENT_BG_COLOR;
+ return updateCalendar();
+ };
/**
* Change the last selected slot's appearence to looks like 'never added to cart'
*/
$scope.markSlotAsRemoved = function (slot) {
- slot.backgroundColor = 'white'
- slot.title = ''
- slot.borderColor = FREE_SLOT_BORDER_COLOR
- slot.id = null
- slot.isValid = false
- slot.is_reserved = false
- slot.can_modify = false
- slot.offered = false
- if (slot.is_completed) { slot.is_completed = false }
- return updateCalendar()
- }
+ slot.backgroundColor = 'white';
+ slot.title = '';
+ slot.borderColor = FREE_SLOT_BORDER_COLOR;
+ slot.id = null;
+ slot.isValid = false;
+ slot.is_reserved = false;
+ slot.can_modify = false;
+ slot.offered = false;
+ if (slot.is_completed) { slot.is_completed = false; }
+ return updateCalendar();
+ };
/**
* Callback when a slot was successfully cancelled. Reset the slot style as 'ready to book'
*/
- $scope.slotCancelled = function () { $scope.markSlotAsRemoved($scope.selectedEvent) }
+ $scope.slotCancelled = function () { $scope.markSlotAsRemoved($scope.selectedEvent); };
/**
* Change the last selected slot's appearence to looks like 'currently looking for a new destination to exchange'
*/
$scope.markSlotAsModifying = function () {
- $scope.selectedEvent.backgroundColor = '#eee'
- $scope.selectedEvent.title = _t('space_reserve.i_change')
- return updateCalendar()
- }
+ $scope.selectedEvent.backgroundColor = '#eee';
+ $scope.selectedEvent.title = _t('space_reserve.i_change');
+ return updateCalendar();
+ };
/**
* Change the last selected slot's appearence to looks like 'the slot being exchanged will take this place'
*/
$scope.changeModifyTrainingSlot = function () {
if ($scope.events.placable) {
- $scope.events.placable.backgroundColor = 'white'
- $scope.events.placable.title = ''
+ $scope.events.placable.backgroundColor = 'white';
+ $scope.events.placable.title = '';
}
if (!$scope.events.placable || ($scope.events.placable._id !== $scope.selectedEvent._id)) {
- $scope.selectedEvent.backgroundColor = '#bbb'
- $scope.selectedEvent.title = _t('space_reserve.i_shift')
+ $scope.selectedEvent.backgroundColor = '#bbb';
+ $scope.selectedEvent.title = _t('space_reserve.i_shift');
}
- return updateCalendar()
- }
+ return updateCalendar();
+ };
/**
* When modifying an already booked reservation, callback when the modification was successfully done.
*/
$scope.modifyTrainingSlot = function () {
- $scope.events.placable.title = _t('space_reserve.i_ve_reserved')
- $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.events.placable.title = _t('space_reserve.i_ve_reserved');
+ $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.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
- if ($scope.events.modifiable.is_completed) { $scope.events.modifiable.is_completed = false }
+ $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;
+ if ($scope.events.modifiable.is_completed) { $scope.events.modifiable.is_completed = false; }
- return updateCalendar()
- }
+ return updateCalendar();
+ };
/**
* Cancel the current booking modification, reseting the whole process
*/
$scope.cancelModifyTrainingSlot = function () {
if ($scope.events.placable) {
- $scope.events.placable.backgroundColor = 'white'
- $scope.events.placable.title = ''
+ $scope.events.placable.backgroundColor = 'white';
+ $scope.events.placable.title = '';
}
- $scope.events.modifiable.title = _t('space_reserve.i_ve_reserved')
- $scope.events.modifiable.backgroundColor = 'white'
+ $scope.events.modifiable.title = _t('space_reserve.i_ve_reserved');
+ $scope.events.modifiable.backgroundColor = 'white';
- return updateCalendar()
- }
+ return updateCalendar();
+ };
/**
* Callback to deal with the reservations of the user selected in the dropdown list instead of the current user's
@@ -395,22 +395,22 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$stateP
$scope.updateMember = function () {
if ($scope.ctrl.member) {
Member.get({ id: $scope.ctrl.member.id }, function (member) {
- $scope.ctrl.member = member
+ $scope.ctrl.member = member;
return Availability.spaces({ spaceId: $scope.space.id, member_id: $scope.ctrl.member.id }, function (spaces) {
- uiCalendarConfig.calendars.calendar.fullCalendar('removeEvents')
+ uiCalendarConfig.calendars.calendar.fullCalendar('removeEvents');
return $scope.eventSources.splice(0, 1, {
events: spaces,
textColor: 'black'
}
- )
- })
- })
+ );
+ });
+ });
}
// as the events are re-fetched for the new user, we must re-init the cart
- $scope.events.reserved = []
- $scope.selectedPlan = null
- return $scope.plansAreShown = false
- }
+ $scope.events.reserved = [];
+ $scope.selectedPlan = null;
+ return $scope.plansAreShown = false;
+ };
/**
* Add the provided plan to the current shopping cart
@@ -419,28 +419,28 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$stateP
$scope.selectPlan = function (plan) {
// toggle selected plan
if ($scope.selectedPlan !== plan) {
- $scope.selectedPlan = plan
+ $scope.selectedPlan = plan;
} else {
- $scope.selectedPlan = null
+ $scope.selectedPlan = null;
}
- return $scope.planSelectionTime = new Date()
- }
+ return $scope.planSelectionTime = new Date();
+ };
/**
* Changes the user current view from the plan subsription screen to the machine reservation agenda
* @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
$scope.doNotSubscribePlan = function (e) {
- e.preventDefault()
- $scope.plansAreShown = false
- $scope.selectedPlan = null
- return $scope.planSelectionTime = new Date()
- }
+ e.preventDefault();
+ $scope.plansAreShown = false;
+ $scope.selectedPlan = null;
+ return $scope.planSelectionTime = new Date();
+ };
/**
* Switch the user's view from the reservation agenda to the plan subscription
*/
- $scope.showPlans = function () { $scope.plansAreShown = true }
+ $scope.showPlans = function () { $scope.plansAreShown = true; };
/**
* Once the reservation is booked (payment process successfully completed), change the event style
@@ -449,32 +449,32 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$stateP
*/
$scope.afterPayment = function (reservation) {
angular.forEach($scope.events.paid, function (spaceSlot, key) {
- spaceSlot.is_reserved = true
- spaceSlot.can_modify = true
- spaceSlot.title = _t('space_reserve.i_ve_reserved')
- spaceSlot.backgroundColor = 'white'
- spaceSlot.borderColor = RESERVED_SLOT_BORDER_COLOR
- return updateSpaceSlotId(spaceSlot, reservation)
- })
+ spaceSlot.is_reserved = true;
+ spaceSlot.can_modify = true;
+ spaceSlot.title = _t('space_reserve.i_ve_reserved');
+ spaceSlot.backgroundColor = 'white';
+ spaceSlot.borderColor = RESERVED_SLOT_BORDER_COLOR;
+ return updateSpaceSlotId(spaceSlot, reservation);
+ });
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
+ $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan);
+ Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan);
+ $scope.plansAreShown = false;
+ $scope.selectedPlan = null;
}
- $scope.ctrl.member.training_credits = angular.copy(reservation.user.training_credits)
- $scope.ctrl.member.machine_credits = angular.copy(reservation.user.machine_credits)
- Auth._currentUser.training_credits = angular.copy(reservation.user.training_credits)
- Auth._currentUser.machine_credits = angular.copy(reservation.user.machine_credits)
+ $scope.ctrl.member.training_credits = angular.copy(reservation.user.training_credits);
+ $scope.ctrl.member.machine_credits = angular.copy(reservation.user.machine_credits);
+ Auth._currentUser.training_credits = angular.copy(reservation.user.training_credits);
+ Auth._currentUser.machine_credits = angular.copy(reservation.user.machine_credits);
- return refetchCalendar()
- }
+ return refetchCalendar();
+ };
/**
* To use as callback in Array.prototype.filter to get only enabled plans
*/
- $scope.filterDisabledPlans = function (plan) { return !plan.disabled }
+ $scope.filterDisabledPlans = function (plan) { return !plan.disabled; };
/* PRIVATE SCOPE */
@@ -483,9 +483,9 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$stateP
*/
const initialize = function () {
if ($scope.currentUser.role !== 'admin') {
- return Member.get({ id: $scope.currentUser.id }, function (member) { $scope.ctrl.member = member })
+ return Member.get({ id: $scope.currentUser.id }, function (member) { $scope.ctrl.member = member; });
}
- }
+ };
/**
* Triggered when the user clicks on a reservation slot in the agenda.
@@ -495,12 +495,12 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$stateP
* @see http://fullcalendar.io/docs/mouse/eventClick/
*/
var calendarEventClickCb = function (event, jsEvent, view) {
- $scope.selectedEvent = event
+ $scope.selectedEvent = event;
if ($stateParams.id === 'all') {
- $scope.training = event.training
+ $scope.training = event.training;
}
- return $scope.selectionTime = new Date()
- }
+ return $scope.selectionTime = new Date();
+ };
/**
* Triggered when fullCalendar tries to graphicaly render an event block.
@@ -509,13 +509,13 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$stateP
*/
var eventRenderCb = function (event, element, view) {
if (($scope.currentUser.role === 'admin') && (event.tags.length > 0)) {
- let html = ''
+ let html = '';
for (let tag of Array.from(event.tags)) {
- html += `${tag.name}`
+ html += `${tag.name}`;
}
- element.find('.fc-time').append(html)
+ element.find('.fc-time').append(html);
}
- }
+ };
/**
* After payment, update the id of the newly reserved slot with the id returned by the server.
@@ -526,28 +526,28 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$stateP
var updateSpaceSlotId = function (slot, reservation) {
angular.forEach(reservation.slots, function (s) {
if (slot.start_at === slot.start_at) {
- return slot.id = s.id
+ return slot.id = s.id;
}
- })
- }
+ });
+ };
/**
* Update the calendar's display to render the new attributes of the events
*/
- var updateCalendar = function () { uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents') }
+ var updateCalendar = function () { uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents'); };
/**
* Asynchronously fetch the events from the API and refresh the calendar's view with these new events
*/
var refetchCalendar = function () {
$timeout(function () {
- uiCalendarConfig.calendars.calendar.fullCalendar('refetchEvents')
- return uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents')
- })
- }
+ uiCalendarConfig.calendars.calendar.fullCalendar('refetchEvents');
+ return uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents');
+ });
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/trainings.js.erb b/app/assets/javascripts/controllers/trainings.js.erb
index 15bb64c5e..d29ac27b9 100644
--- a/app/assets/javascripts/controllers/trainings.js.erb
+++ b/app/assets/javascripts/controllers/trainings.js.erb
@@ -12,7 +12,7 @@
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
/**
* Public listing of the trainings
@@ -20,18 +20,18 @@
Application.Controllers.controller('TrainingsController', ['$scope', '$state', 'trainingsPromise',
function ($scope, $state, trainingsPromise) {
// List of trainings
- $scope.trainings = trainingsPromise
+ $scope.trainings = trainingsPromise;
/**
* Callback for the 'reserve' button
*/
- $scope.reserveTraining = function (training, event) { $state.go('app.logged.trainings_reserve', { id: training.slug }) }
+ $scope.reserveTraining = function (training, event) { $state.go('app.logged.trainings_reserve', { id: training.slug }); };
/**
* Callback for the 'show' button
*/
- $scope.showTraining = function (training) { $state.go('app.public.training_show', { id: training.slug }) }
- }])
+ $scope.showTraining = function (training) { $state.go('app.public.training_show', { id: training.slug }); };
+ }]);
/**
* Public view of a specific training
@@ -39,7 +39,7 @@ Application.Controllers.controller('TrainingsController', ['$scope', '$state', '
Application.Controllers.controller('ShowTrainingController', ['$scope', '$state', 'trainingPromise', 'growl', '_t', 'dialogs',
function ($scope, $state, trainingPromise, growl, _t, dialogs) {
// Current training
- $scope.training = trainingPromise
+ $scope.training = trainingPromise;
/**
* Callback to delete the current training (admins only)
@@ -47,7 +47,7 @@ Application.Controllers.controller('ShowTrainingController', ['$scope', '$state'
$scope.delete = function (training) {
// check the permissions
if ($scope.currentUser.role !== 'admin') {
- console.error(_t('unauthorized_operation'))
+ console.error(_t('unauthorized_operation'));
} else {
dialogs.confirm(
{
@@ -56,34 +56,34 @@ Application.Controllers.controller('ShowTrainingController', ['$scope', '$state'
return {
title: _t('confirmation_required'),
msg: _t('do_you_really_want_to_delete_this_training')
- }
+ };
}
}
},
function () { // deletion confirmed
// delete the training then redirect to the trainings listing
training.$delete(
- function () { $state.go('app.public.trainings_list') },
+ function () { $state.go('app.public.trainings_list'); },
function (error) {
- growl.warning(_t('the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users'))
- console.error(error)
+ growl.warning(_t('the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users'));
+ console.error(error);
}
- )
+ );
}
- )
+ );
}
- }
+ };
/**
* Callback for the 'reserve' button
*/
- $scope.reserveTraining = function (training, event) { $state.go('app.logged.trainings_reserve', { id: training.id }) }
+ $scope.reserveTraining = function (training, event) { $state.go('app.logged.trainings_reserve', { id: training.id }); };
/**
* Revert view to the full list of trainings ("<-" button)
*/
- $scope.cancel = function (event) { $state.go('app.public.trainings_list') }
- }])
+ $scope.cancel = function (event) { $state.go('app.public.trainings_list'); };
+ }]);
/**
* Controller used in the training reservation agenda page.
@@ -96,28 +96,28 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta
/* PRIVATE STATIC CONSTANTS */
// Color of the selected event backgound
- const SELECTED_EVENT_BG_COLOR = '#ffdd00'
+ const SELECTED_EVENT_BG_COLOR = '#ffdd00';
// Slot free to be booked
- const FREE_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::TRAINING_COLOR %>'
+ const FREE_SLOT_BORDER_COLOR = '<%= AvailabilityHelper::TRAINING_COLOR %>';
/* PUBLIC SCOPE */
// bind the trainings availabilities with full-Calendar events
- $scope.eventSources = [ { events: availabilityTrainingsPromise, textColor: 'black' } ]
+ $scope.eventSources = [ { events: availabilityTrainingsPromise, textColor: 'black' } ];
// the user to deal with, ie. the current user for non-admins
$scope.ctrl =
- { member: {} }
+ { member: {} };
// list of plans, classified by group
- $scope.plansClassifiedByGroup = []
+ $scope.plansClassifiedByGroup = [];
for (let group of Array.from(groupsPromise)) {
- const groupObj = { id: group.id, name: group.name, plans: [] }
+ const groupObj = { id: group.id, name: group.name, plans: [] };
for (let plan of Array.from(plansPromise)) {
- if (plan.group_id === group.id) { groupObj.plans.push(plan) }
+ if (plan.group_id === group.id) { groupObj.plans.push(plan); }
}
- $scope.plansClassifiedByGroup.push(groupObj)
+ $scope.plansClassifiedByGroup.push(groupObj);
}
// mapping of fullCalendar events.
@@ -127,141 +127,141 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta
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: *}
- }
+ };
// the moment when the slot selection changed for the last time, used to trigger changes in the cart
- $scope.selectionTime = null
+ $scope.selectionTime = null;
// the last clicked event in the calender
- $scope.selectedEvent = null
+ $scope.selectedEvent = null;
// indicates the state of the current view : calendar or plans information
- $scope.plansAreShown = false
+ $scope.plansAreShown = false;
// will store the user's plan if he choosed to buy one
- $scope.selectedPlan = null
+ $scope.selectedPlan = null;
// the moment when the plan selection changed for the last time, used to trigger changes in the cart
- $scope.planSelectionTime = null
+ $scope.planSelectionTime = null;
// Selected training
- $scope.training = trainingPromise
+ $scope.training = trainingPromise;
// 'all' OR training's slug
- $scope.mode = $stateParams.id
+ $scope.mode = $stateParams.id;
// fullCalendar (v2) configuration
$scope.calendarConfig = CalendarConfig({
minTime: moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss')),
maxTime: moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss')),
eventClick (event, jsEvent, view) {
- return calendarEventClickCb(event, jsEvent, view)
+ return calendarEventClickCb(event, jsEvent, view);
},
eventRender (event, element, view) {
- return eventRenderCb(event, element, view)
+ return eventRenderCb(event, element, view);
}
- })
+ });
// Application global settings
- $scope.settings = settingsPromise
+ $scope.settings = settingsPromise;
// Global config: message to the end user concerning the subscriptions rules
- $scope.subscriptionExplicationsAlert = settingsPromise.subscription_explications_alert
+ $scope.subscriptionExplicationsAlert = settingsPromise.subscription_explications_alert;
// Global config: message to the end user concerning the training reservation
- $scope.trainingExplicationsAlert = settingsPromise.training_explications_alert
+ $scope.trainingExplicationsAlert = settingsPromise.training_explications_alert;
// Global config: message to the end user giving advice about the training reservation
- $scope.trainingInformationMessage = settingsPromise.training_information_message
+ $scope.trainingInformationMessage = settingsPromise.training_information_message;
/**
* Change the last selected slot's appearence to looks like 'added to cart'
*/
$scope.markSlotAsAdded = function () {
- $scope.selectedEvent.backgroundColor = SELECTED_EVENT_BG_COLOR
- return updateCalendar()
- }
+ $scope.selectedEvent.backgroundColor = SELECTED_EVENT_BG_COLOR;
+ return updateCalendar();
+ };
/**
* Change the last selected slot's appearence to looks like 'never added to cart'
*/
$scope.markSlotAsRemoved = function (slot) {
- slot.backgroundColor = 'white'
- slot.title = slot.training.name
- slot.borderColor = FREE_SLOT_BORDER_COLOR
- slot.id = null
- slot.isValid = false
- slot.is_reserved = false
- slot.can_modify = false
- slot.offered = false
- if (slot.is_completed) { slot.is_completed = false }
- return updateCalendar()
- }
+ slot.backgroundColor = 'white';
+ slot.title = slot.training.name;
+ slot.borderColor = FREE_SLOT_BORDER_COLOR;
+ slot.id = null;
+ slot.isValid = false;
+ slot.is_reserved = false;
+ slot.can_modify = false;
+ slot.offered = false;
+ if (slot.is_completed) { slot.is_completed = false; }
+ return updateCalendar();
+ };
/**
* Callback when a slot was successfully cancelled. Reset the slot style as 'ready to book'
*/
- $scope.slotCancelled = function () { $scope.markSlotAsRemoved($scope.selectedEvent) }
+ $scope.slotCancelled = function () { $scope.markSlotAsRemoved($scope.selectedEvent); };
/**
* Change the last selected slot's appearence to looks like 'currently looking for a new destination to exchange'
*/
$scope.markSlotAsModifying = function () {
- $scope.selectedEvent.backgroundColor = '#eee'
- $scope.selectedEvent.title = $scope.selectedEvent.training.name + ' - ' + _t('i_change')
- return updateCalendar()
- }
+ $scope.selectedEvent.backgroundColor = '#eee';
+ $scope.selectedEvent.title = $scope.selectedEvent.training.name + ' - ' + _t('i_change');
+ return updateCalendar();
+ };
/**
* Change the last selected slot's appearence to looks like 'the slot being exchanged will take this place'
*/
$scope.changeModifyTrainingSlot = function () {
if ($scope.events.placable) {
- $scope.events.placable.backgroundColor = 'white'
- $scope.events.placable.title = $scope.events.placable.training.name
+ $scope.events.placable.backgroundColor = 'white';
+ $scope.events.placable.title = $scope.events.placable.training.name;
}
if (!$scope.events.placable || ($scope.events.placable._id !== $scope.selectedEvent._id)) {
- $scope.selectedEvent.backgroundColor = '#bbb'
- $scope.selectedEvent.title = $scope.selectedEvent.training.name + ' - ' + _t('i_shift')
+ $scope.selectedEvent.backgroundColor = '#bbb';
+ $scope.selectedEvent.title = $scope.selectedEvent.training.name + ' - ' + _t('i_shift');
}
- return updateCalendar()
- }
+ return updateCalendar();
+ };
/**
* When modifying an already booked reservation, callback when the modification was successfully done.
*/
$scope.modifyTrainingSlot = function () {
- $scope.events.placable.title = $scope.currentUser.role !== 'admin' ? $scope.events.placable.training.name + ' - ' + _t('i_ve_reserved') : $scope.events.placable.training.name
- $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.events.placable.title = $scope.currentUser.role !== 'admin' ? $scope.events.placable.training.name + ' - ' + _t('i_ve_reserved') : $scope.events.placable.training.name;
+ $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.events.modifiable.backgroundColor = 'white'
- $scope.events.modifiable.title = $scope.events.modifiable.training.name
- $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
- if ($scope.events.modifiable.is_completed) { $scope.events.modifiable.is_completed = false }
+ $scope.events.modifiable.backgroundColor = 'white';
+ $scope.events.modifiable.title = $scope.events.modifiable.training.name;
+ $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;
+ if ($scope.events.modifiable.is_completed) { $scope.events.modifiable.is_completed = false; }
- return updateCalendar()
- }
+ return updateCalendar();
+ };
/**
* Cancel the current booking modification, reseting the whole process
*/
$scope.cancelModifyTrainingSlot = function () {
if ($scope.events.placable) {
- $scope.events.placable.backgroundColor = 'white'
- $scope.events.placable.title = $scope.events.placable.training.name
+ $scope.events.placable.backgroundColor = 'white';
+ $scope.events.placable.title = $scope.events.placable.training.name;
}
- $scope.events.modifiable.title = $scope.currentUser.role !== 'admin' ? $scope.events.modifiable.training.name + ' - ' + _t('i_ve_reserved') : $scope.events.modifiable.training.name
- $scope.events.modifiable.backgroundColor = 'white'
+ $scope.events.modifiable.title = $scope.currentUser.role !== 'admin' ? $scope.events.modifiable.training.name + ' - ' + _t('i_ve_reserved') : $scope.events.modifiable.training.name;
+ $scope.events.modifiable.backgroundColor = 'white';
- return updateCalendar()
- }
+ return updateCalendar();
+ };
/**
* Callback to deal with the reservations of the user selected in the dropdown list instead of the current user's
@@ -270,23 +270,23 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta
$scope.updateMember = function () {
if ($scope.ctrl.member) {
Member.get({ id: $scope.ctrl.member.id }, function (member) {
- $scope.ctrl.member = member
- const id = $stateParams.id === 'all' ? $stateParams.id : $scope.training.id
+ $scope.ctrl.member = member;
+ const id = $stateParams.id === 'all' ? $stateParams.id : $scope.training.id;
return Availability.trainings({ trainingId: id, member_id: $scope.ctrl.member.id }, function (trainings) {
- uiCalendarConfig.calendars.calendar.fullCalendar('removeEvents')
+ uiCalendarConfig.calendars.calendar.fullCalendar('removeEvents');
return $scope.eventSources.splice(0, 1, {
events: trainings,
textColor: 'black'
}
- )
- })
- })
+ );
+ });
+ });
}
// as the events are re-fetched for the new user, we must re-init the cart
- $scope.events.reserved = []
- $scope.selectedPlan = null
- return $scope.plansAreShown = false
- }
+ $scope.events.reserved = [];
+ $scope.selectedPlan = null;
+ return $scope.plansAreShown = false;
+ };
/**
* Add the provided plan to the current shopping cart
@@ -295,28 +295,28 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta
$scope.selectPlan = function (plan) {
// toggle selected plan
if ($scope.selectedPlan !== plan) {
- $scope.selectedPlan = plan
+ $scope.selectedPlan = plan;
} else {
- $scope.selectedPlan = null
+ $scope.selectedPlan = null;
}
- return $scope.planSelectionTime = new Date()
- }
+ return $scope.planSelectionTime = new Date();
+ };
/**
* Changes the user current view from the plan subsription screen to the machine reservation agenda
* @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
$scope.doNotSubscribePlan = function (e) {
- e.preventDefault()
- $scope.plansAreShown = false
- $scope.selectedPlan = null
- return $scope.planSelectionTime = new Date()
- }
+ e.preventDefault();
+ $scope.plansAreShown = false;
+ $scope.selectedPlan = null;
+ return $scope.planSelectionTime = new Date();
+ };
/**
* Switch the user's view from the reservation agenda to the plan subscription
*/
- $scope.showPlans = function () { $scope.plansAreShown = true }
+ $scope.showPlans = function () { $scope.plansAreShown = true; };
/**
* Once the reservation is booked (payment process successfully completed), change the event style
@@ -324,31 +324,31 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta
* @param reservation {Object}
*/
$scope.afterPayment = function (reservation) {
- $scope.events.paid[0].backgroundColor = 'white'
- $scope.events.paid[0].is_reserved = true
- $scope.events.paid[0].can_modify = true
- updateTrainingSlotId($scope.events.paid[0], reservation)
- $scope.events.paid[0].borderColor = '#b2e774'
- $scope.events.paid[0].title = $scope.events.paid[0].training.name + ' - ' + _t('i_ve_reserved')
+ $scope.events.paid[0].backgroundColor = 'white';
+ $scope.events.paid[0].is_reserved = true;
+ $scope.events.paid[0].can_modify = true;
+ updateTrainingSlotId($scope.events.paid[0], reservation);
+ $scope.events.paid[0].borderColor = '#b2e774';
+ $scope.events.paid[0].title = $scope.events.paid[0].training.name + ' - ' + _t('i_ve_reserved');
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
+ $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan);
+ Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan);
+ $scope.plansAreShown = false;
+ $scope.selectedPlan = null;
}
- $scope.ctrl.member.training_credits = angular.copy(reservation.user.training_credits)
- $scope.ctrl.member.machine_credits = angular.copy(reservation.user.machine_credits)
- Auth._currentUser.training_credits = angular.copy(reservation.user.training_credits)
- Auth._currentUser.machine_credits = angular.copy(reservation.user.machine_credits)
+ $scope.ctrl.member.training_credits = angular.copy(reservation.user.training_credits);
+ $scope.ctrl.member.machine_credits = angular.copy(reservation.user.machine_credits);
+ Auth._currentUser.training_credits = angular.copy(reservation.user.training_credits);
+ Auth._currentUser.machine_credits = angular.copy(reservation.user.machine_credits);
- return refetchCalendar()
- }
+ return refetchCalendar();
+ };
/**
* To use as callback in Array.prototype.filter to get only enabled plans
*/
- $scope.filterDisabledPlans = function (plan) { return !plan.disabled }
+ $scope.filterDisabledPlans = function (plan) { return !plan.disabled; };
/* PRIVATE SCOPE */
@@ -357,9 +357,9 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta
*/
const initialize = function () {
if ($scope.currentUser.role !== 'admin') {
- return Member.get({ id: $scope.currentUser.id }, function (member) { $scope.ctrl.member = member })
+ return Member.get({ id: $scope.currentUser.id }, function (member) { $scope.ctrl.member = member; });
}
- }
+ };
/**
* Triggered when the user clicks on a reservation slot in the agenda.
@@ -369,12 +369,12 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta
* @see http://fullcalendar.io/docs/mouse/eventClick/
*/
var calendarEventClickCb = function (event, jsEvent, view) {
- $scope.selectedEvent = event
+ $scope.selectedEvent = event;
if ($stateParams.id === 'all') {
- $scope.training = event.training
+ $scope.training = event.training;
}
- return $scope.selectionTime = new Date()
- }
+ return $scope.selectionTime = new Date();
+ };
/**
* Triggered when fullCalendar tries to graphicaly render an event block.
@@ -383,13 +383,13 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta
*/
var eventRenderCb = function (event, element, view) {
if (($scope.currentUser.role === 'admin') && (event.tags.length > 0)) {
- let html = ''
+ let html = '';
for (let tag of Array.from(event.tags)) {
- html += `${tag.name}`
+ html += `${tag.name}`;
}
- element.find('.fc-time').append(html)
+ element.find('.fc-time').append(html);
}
- }
+ };
/**
* After payment, update the id of the newly reserved slot with the id returned by the server.
@@ -400,28 +400,28 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta
var updateTrainingSlotId = function (slot, reservation) {
angular.forEach(reservation.slots, function (s) {
if (slot.start_at === slot.start_at) {
- return slot.id = s.id
+ return slot.id = s.id;
}
- })
- }
+ });
+ };
/**
* Update the calendar's display to render the new attributes of the events
*/
- var updateCalendar = function () { uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents') }
+ var updateCalendar = function () { uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents'); };
/**
* Asynchronously fetch the events from the API and refresh the calendar's view with these new events
*/
var refetchCalendar = function () {
$timeout(function () {
- uiCalendarConfig.calendars.calendar.fullCalendar('refetchEvents')
- return uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents')
- })
- }
+ uiCalendarConfig.calendars.calendar.fullCalendar('refetchEvents');
+ return uiCalendarConfig.calendars.calendar.fullCalendar('rerenderEvents');
+ });
+ };
// !!! MUST BE CALLED AT THE END of the controller
- return initialize()
+ return initialize();
}
-])
+]);
diff --git a/app/assets/javascripts/controllers/wallet.js b/app/assets/javascripts/controllers/wallet.js
index 0a85e4748..e2e24aaab 100644
--- a/app/assets/javascripts/controllers/wallet.js
+++ b/app/assets/javascripts/controllers/wallet.js
@@ -9,16 +9,16 @@
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
Application.Controllers.controller('WalletController', ['$scope', 'walletPromise', 'transactionsPromise',
function ($scope, walletPromise, transactionsPromise) {
/* PUBLIC SCOPE */
// current user wallet
- $scope.wallet = walletPromise
+ $scope.wallet = walletPromise;
// current wallet transactions
- return $scope.transactions = transactionsPromise
+ return $scope.transactions = transactionsPromise;
}
-])
+]);
diff --git a/app/assets/javascripts/directives/bs-jasny-fileinput.js b/app/assets/javascripts/directives/bs-jasny-fileinput.js
index f9f7dd44b..0055d2ffc 100644
--- a/app/assets/javascripts/directives/bs-jasny-fileinput.js
+++ b/app/assets/javascripts/directives/bs-jasny-fileinput.js
@@ -1,34 +1,34 @@
-'use strict'
+'use strict';
Application.Directives.directive('bsJasnyFileinput', [function () {
return {
require: ['ngModel'],
link: function ($scope, elm, attrs, requiredCtrls) {
- var ngModelCtrl = requiredCtrls[0]
- var fileinput = elm.parents('[data-provides=fileinput]')
- var filetypeRegex = attrs.bsJasnyFileinput
+ var ngModelCtrl = requiredCtrls[0];
+ var fileinput = elm.parents('[data-provides=fileinput]');
+ var filetypeRegex = attrs.bsJasnyFileinput;
fileinput.on('clear.bs.fileinput', function (e) {
if (ngModelCtrl) {
- ngModelCtrl.$setViewValue(null)
- ngModelCtrl.$setPristine()
- $scope.$apply()
+ ngModelCtrl.$setViewValue(null);
+ ngModelCtrl.$setPristine();
+ $scope.$apply();
}
- })
+ });
fileinput.on('change.bs.fileinput', function (e, files) {
if (ngModelCtrl) {
if (files) {
- ngModelCtrl.$setViewValue(files.result)
+ ngModelCtrl.$setViewValue(files.result);
} else {
- ngModelCtrl.$setPristine()
+ ngModelCtrl.$setPristine();
}
// TODO: ne marche pas pour filetype
if (filetypeRegex) {
- if (files && typeof files.type !== 'undefined' && files.type.match(new RegExp(filetypeRegex))) { ngModelCtrl.$setValidity('filetype', true) } else { ngModelCtrl.$setValidity('filetype', false) }
+ if (files && typeof files.type !== 'undefined' && files.type.match(new RegExp(filetypeRegex))) { ngModelCtrl.$setValidity('filetype', true); } else { ngModelCtrl.$setValidity('filetype', false); }
};
}
- $scope.$apply()
- })
+ $scope.$apply();
+ });
}
- }
-}])
+ };
+}]);
diff --git a/app/assets/javascripts/directives/cart.js.erb b/app/assets/javascripts/directives/cart.js.erb
index 3b417cba8..5cc9a2bf5 100644
--- a/app/assets/javascripts/directives/cart.js.erb
+++ b/app/assets/javascripts/directives/cart.js.erb
@@ -40,28 +40,28 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
templateUrl: '<%= asset_path "shared/_cart.html" %>',
link ($scope, element, attributes) {
// will store the user's plan if he choosed to buy one
- $scope.selectedPlan = null
+ $scope.selectedPlan = null;
// total amount of the bill to pay
- $scope.amountTotal = 0
+ $scope.amountTotal = 0;
// total amount of the elements in the cart, without considering any coupon
- $scope.totalNoCoupon = 0
+ $scope.totalNoCoupon = 0;
// Discount coupon to apply to the basket, if any
- $scope.coupon = { applied: null }
+ $scope.coupon = { applied: null };
// Global config: is the user authorized to change his bookings slots?
- $scope.enableBookingMove = ($scope.settings.booking_move_enable === 'true')
+ $scope.enableBookingMove = ($scope.settings.booking_move_enable === 'true');
// Global config: delay in hours before a booking while changing the booking slot is forbidden
- $scope.moveBookingDelay = parseInt($scope.settings.booking_move_delay)
+ $scope.moveBookingDelay = parseInt($scope.settings.booking_move_delay);
// Global config: is the user authorized to cancel his bookings?
- $scope.enableBookingCancel = ($scope.settings.booking_cancel_enable === 'true')
+ $scope.enableBookingCancel = ($scope.settings.booking_cancel_enable === 'true');
// Global config: delay in hours before a booking while the cancellation is forbidden
- $scope.cancelBookingDelay = parseInt($scope.settings.booking_cancel_delay)
+ $scope.cancelBookingDelay = parseInt($scope.settings.booking_cancel_delay);
/**
* Add the provided slot to the shopping cart (state transition from free to 'about to be reserved')
@@ -69,9 +69,9 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
* @param slot {Object} fullCalendar event object
*/
$scope.validateSlot = function (slot) {
- slot.isValid = true
- return updateCartPrice()
- }
+ slot.isValid = true;
+ return updateCartPrice();
+ };
/**
* Remove the provided slot from the shopping cart (state transition from 'about to be reserved' to free)
@@ -81,29 +81,29 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
* @param [event] {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
$scope.removeSlot = function (slot, index, event) {
- if (event) { event.preventDefault() }
- $scope.events.reserved.splice(index, 1)
+ if (event) { event.preventDefault(); }
+ $scope.events.reserved.splice(index, 1);
// if is was the last slot, we remove any plan from the cart
if ($scope.events.reserved.length === 0) {
- $scope.selectedPlan = null
- $scope.plan = null
- $scope.modePlans = false
+ $scope.selectedPlan = null;
+ $scope.plan = null;
+ $scope.modePlans = false;
}
- if (typeof $scope.onSlotRemovedFromCart === 'function') { $scope.onSlotRemovedFromCart(slot) }
- return updateCartPrice()
- }
+ if (typeof $scope.onSlotRemovedFromCart === 'function') { $scope.onSlotRemovedFromCart(slot); }
+ return updateCartPrice();
+ };
/**
* 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.isSlotsValid = function () {
- let isValid = true
+ let isValid = true;
angular.forEach($scope.events.reserved, function (m) {
- if (!m.isValid) { return isValid = false }
- })
- return isValid
- }
+ if (!m.isValid) { return isValid = false; }
+ });
+ return isValid;
+ };
/**
* Switch the user's view from the reservation agenda to the plan subscription
@@ -111,12 +111,12 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
$scope.showPlans = function () {
// first, we ensure that a user was selected (admin) or logged (member)
if (Object.keys($scope.user).length > 0) {
- return $scope.modePlans = true
+ return $scope.modePlans = true;
} else {
// otherwise we alert, this error musn't occur when the current user hasn't the admin role
- return growl.error(_t('cart.please_select_a_member_first'))
+ return growl.error(_t('cart.please_select_a_member_first'));
}
- }
+ };
/**
* Validates the shopping chart and redirect the user to the payment step
@@ -124,23 +124,23 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
$scope.payCart = function () {
// first, we check that a user was selected
if (Object.keys($scope.user).length > 0) {
- const reservation = mkReservation($scope.user, $scope.events.reserved, $scope.selectedPlan)
+ const reservation = mkReservation($scope.user, $scope.events.reserved, $scope.selectedPlan);
return Wallet.getWalletByUser({ user_id: $scope.user.id }, function (wallet) {
- const amountToPay = helpers.getAmountToPay($scope.amountTotal, wallet.amount)
+ const amountToPay = helpers.getAmountToPay($scope.amountTotal, wallet.amount);
if (!$scope.isAdmin() && (amountToPay > 0)) {
- return payByStripe(reservation)
+ return payByStripe(reservation);
} else {
if ($scope.isAdmin() || (amountToPay === 0)) {
- return payOnSite(reservation)
+ return payOnSite(reservation);
}
}
- })
+ });
} else {
// otherwise we alert, this error musn't occur when the current user is not admin
- return growl.error(_t('cart.please_select_a_member_first'))
+ return growl.error(_t('cart.please_select_a_member_first'));
}
- }
+ };
/**
* When modifying an already booked reservation, confirm the modification.
@@ -155,62 +155,62 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
}
, function () { // success
// -> run the callback
- if (typeof $scope.onSlotModifySuccess === 'function') { $scope.onSlotModifySuccess() }
+ if (typeof $scope.onSlotModifySuccess === 'function') { $scope.onSlotModifySuccess(); }
// -> set the events as successfully moved (to display a summary)
$scope.events.moved = {
newSlot: $scope.events.placable,
oldSlot: $scope.events.modifiable
- }
+ };
// -> reset the 'moving' status
- $scope.events.placable = null
- return $scope.events.modifiable = null
+ $scope.events.placable = null;
+ return $scope.events.modifiable = null;
}
, function (err) { // failure
- growl.error(_t('cart.unable_to_change_the_reservation'))
- return console.error(err)
- })
- }
+ growl.error(_t('cart.unable_to_change_the_reservation'));
+ return console.error(err);
+ });
+ };
/**
* Cancel the current booking modification, reseting the whole process
* @param event {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
$scope.cancelModifySlot = function (event) {
- if (event) { event.preventDefault() }
- if (typeof $scope.onSlotModifyCancel === 'function') { $scope.onSlotModifyCancel() }
- $scope.events.placable = null
- return $scope.events.modifiable = null
- }
+ if (event) { event.preventDefault(); }
+ if (typeof $scope.onSlotModifyCancel === 'function') { $scope.onSlotModifyCancel(); }
+ $scope.events.placable = null;
+ return $scope.events.modifiable = null;
+ };
/**
* When modifying an already booked reservation, cancel the choice of the new slot
* @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
*/
$scope.removeSlotToPlace = function (e) {
- e.preventDefault()
- if (typeof $scope.onSlotModifyUnselect === 'function') { $scope.onSlotModifyUnselect() }
- return $scope.events.placable = null
- }
+ e.preventDefault();
+ if (typeof $scope.onSlotModifyUnselect === 'function') { $scope.onSlotModifyUnselect(); }
+ return $scope.events.placable = null;
+ };
/**
* Checks if $scope.events.modifiable and $scope.events.placable have tag incompatibilities
* @returns {boolean} true in case of incompatibility
*/
$scope.tagMissmatch = function () {
- if ($scope.events.placable.tag_ids.length === 0) { return false }
+ if ($scope.events.placable.tag_ids.length === 0) { return false; }
for (let tag of Array.from($scope.events.modifiable.tags)) {
if (!Array.from($scope.events.placable.tag_ids).includes(tag.id)) {
- return true
+ return true;
}
}
- return false
- }
+ return false;
+ };
/**
* Check if the currently logged user has teh 'admin' role?
* @returns {boolean}
*/
- $scope.isAdmin = function () { return $rootScope.currentUser && ($rootScope.currentUser.role === 'admin') }
+ $scope.isAdmin = function () { return $rootScope.currentUser && ($rootScope.currentUser.role === 'admin'); };
/* PRIVATE SCOPE */
@@ -221,27 +221,27 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
// What the bound slot
$scope.$watch('slotSelectionTime', function (newValue, oldValue) {
if (newValue !== oldValue) {
- return slotSelectionChanged()
+ return slotSelectionChanged();
}
- })
+ });
$scope.$watch('user', function (newValue, oldValue) {
if (newValue !== oldValue) {
- resetCartState()
- return updateCartPrice()
+ resetCartState();
+ return updateCartPrice();
}
- })
+ });
$scope.$watch('planSelectionTime', function (newValue, oldValue) {
if (newValue !== oldValue) {
- return planSelectionChanged()
+ return planSelectionChanged();
}
- })
+ });
// watch when a coupon is applied to re-compute the total price
return $scope.$watch('coupon.applied', function (newValue, oldValue) {
if ((newValue !== null) || (oldValue !== null)) {
- return updateCartPrice()
+ return updateCartPrice();
}
- })
- }
+ });
+ };
/**
* Callback triggered when the selected slot changed
@@ -251,57 +251,57 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
if (!$scope.slot.is_reserved && !$scope.events.modifiable && !$scope.slot.is_completed) {
// slot is not reserved and we are not currently modifying a slot
// -> can be added to cart or removed if already present
- const index = $scope.events.reserved.indexOf($scope.slot)
+ const index = $scope.events.reserved.indexOf($scope.slot);
if (index === -1) {
if (($scope.limitToOneSlot === 'true') && $scope.events.reserved[0]) {
// if we limit the number of slots in the cart to 1, and there is already
// a slot in the cart, we remove it before adding the new one
- $scope.removeSlot($scope.events.reserved[0], 0)
+ $scope.removeSlot($scope.events.reserved[0], 0);
}
// slot is not in the cart, so we add it
- $scope.events.reserved.push($scope.slot)
- if (typeof $scope.onSlotAddedToCart === 'function') { $scope.onSlotAddedToCart() }
+ $scope.events.reserved.push($scope.slot);
+ if (typeof $scope.onSlotAddedToCart === 'function') { $scope.onSlotAddedToCart(); }
} else {
// slot is in the cart, remove it
- $scope.removeSlot($scope.slot, index)
+ $scope.removeSlot($scope.slot, index);
}
// in every cases, because a new reservation has started, we reset the cart content
- resetCartState()
+ resetCartState();
// finally, we update the prices
- return updateCartPrice()
+ return updateCartPrice();
} else if (!$scope.slot.is_reserved && !$scope.slot.is_completed && $scope.events.modifiable) {
// slot is not reserved but we are currently modifying a slot
// -> we request the calender to change the rendering
- if (typeof $scope.onSlotModifyUnselect === 'function') { $scope.onSlotModifyUnselect() }
+ if (typeof $scope.onSlotModifyUnselect === 'function') { $scope.onSlotModifyUnselect(); }
// -> then, we re-affect the destination slot
if (!$scope.events.placable || ($scope.events.placable._id !== $scope.slot._id)) {
- return $scope.events.placable = $scope.slot
+ return $scope.events.placable = $scope.slot;
} else {
- return $scope.events.placable = null
+ return $scope.events.placable = null;
}
} else if ($scope.slot.is_reserved && $scope.events.modifiable && ($scope.slot.is_reserved._id === $scope.events.modifiable._id)) {
// slot is reserved and currently modified
// -> we cancel the modification
- return $scope.cancelModifySlot()
+ return $scope.cancelModifySlot();
} else if ($scope.slot.is_reserved && (slotCanBeModified($scope.slot) || slotCanBeCanceled($scope.slot)) && !$scope.events.modifiable && ($scope.events.reserved.length === 0)) {
// slot is reserved and is ok to be modified or cancelled
// but we are not currently running a modification or having any slots in the cart
// -> first the affect the modification/cancellation rights attributes to the current slot
- resetCartState()
- $scope.slot.movable = slotCanBeModified($scope.slot)
- $scope.slot.cancelable = slotCanBeCanceled($scope.slot)
+ resetCartState();
+ $scope.slot.movable = slotCanBeModified($scope.slot);
+ $scope.slot.cancelable = slotCanBeCanceled($scope.slot);
// -> then, we open a dialog to ask to the user to choose an action
return dialogs.confirm({
templateUrl: '<%= asset_path "shared/confirm_modify_slot_modal.html" %>',
resolve: {
- object () { return $scope.slot }
+ object () { return $scope.slot; }
}
}
, function (type) {
// the user has choosen an action, so we proceed
if (type === 'move') {
- if (typeof $scope.onSlotStartToModify === 'function') { $scope.onSlotStartToModify() }
- return $scope.events.modifiable = $scope.slot
+ if (typeof $scope.onSlotStartToModify === 'function') { $scope.onSlotStartToModify(); }
+ return $scope.events.modifiable = $scope.slot;
} else if (type === 'cancel') {
return dialogs.confirm(
{
@@ -310,67 +310,67 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
return {
title: _t('cart.confirmation_required'),
msg: _t('cart.do_you_really_want_to_cancel_this_reservation')
- }
+ };
}
}
},
function () { // cancel confirmed
Slot.cancel({ id: $scope.slot.id }, function () { // successfully canceled
- growl.success(_t('cart.reservation_was_cancelled_successfully'))
- if (typeof $scope.onSlotCancelSuccess === 'function') { return $scope.onSlotCancelSuccess() }
+ growl.success(_t('cart.reservation_was_cancelled_successfully'));
+ if (typeof $scope.onSlotCancelSuccess === 'function') { return $scope.onSlotCancelSuccess(); }
}
, function () { // error while canceling
- growl.error(_t('cart.cancellation_failed'))
- })
+ growl.error(_t('cart.cancellation_failed'));
+ });
}
- )
+ );
}
- })
+ });
}
}
- }
+ };
/**
* Reset the parameters that may lead to a wrong price but leave the content (events added to cart)
*/
var resetCartState = function () {
- $scope.selectedPlan = null
- $scope.coupon.applied = null
- $scope.events.moved = null
- $scope.events.paid = []
- $scope.events.modifiable = null
- return $scope.events.placable = null
- }
+ $scope.selectedPlan = null;
+ $scope.coupon.applied = null;
+ $scope.events.moved = null;
+ $scope.events.paid = [];
+ $scope.events.modifiable = null;
+ return $scope.events.placable = null;
+ };
/**
* Determines if the provided booked slot is able to be modified by the user.
* @param slot {Object} fullCalendar event object
*/
var slotCanBeModified = function (slot) {
- if ($scope.isAdmin()) { return true }
- const slotStart = moment(slot.start)
- const now = moment()
+ if ($scope.isAdmin()) { return true; }
+ const slotStart = moment(slot.start);
+ const now = moment();
if (slot.can_modify && $scope.enableBookingMove && (slotStart.diff(now, 'hours') >= $scope.moveBookingDelay)) {
- return true
+ return true;
} else {
- return false
+ return false;
}
- }
+ };
/**
* Determines if the provided booked slot is able to be canceled by the user.
* @param slot {Object} fullCalendar event object
*/
var slotCanBeCanceled = function (slot) {
- if ($scope.isAdmin()) { return true }
- const slotStart = moment(slot.start)
- const now = moment()
+ if ($scope.isAdmin()) { return true; }
+ const slotStart = moment(slot.start);
+ const now = moment();
if (slot.can_modify && $scope.enableBookingCancel && (slotStart.diff(now, 'hours') >= $scope.cancelBookingDelay)) {
- return true
+ return true;
} else {
- return false
+ return false;
}
- }
+ };
/**
* Callback triggered when the selected slot changed
@@ -378,47 +378,47 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
var planSelectionChanged = function () {
if (Auth.isAuthenticated()) {
if ($scope.selectedPlan !== $scope.plan) {
- $scope.selectedPlan = $scope.plan
+ $scope.selectedPlan = $scope.plan;
} else {
- $scope.selectedPlan = null
+ $scope.selectedPlan = null;
}
- return updateCartPrice()
+ return updateCartPrice();
} else {
return $rootScope.login(null, function () {
- $scope.selectedPlan = $scope.plan
- return updateCartPrice()
- })
+ $scope.selectedPlan = $scope.plan;
+ return updateCartPrice();
+ });
}
- }
+ };
/**
* Update the total price of the current selection/reservation
*/
var updateCartPrice = function () {
if (Object.keys($scope.user).length > 0) {
- const r = mkReservation($scope.user, $scope.events.reserved, $scope.selectedPlan)
+ const r = mkReservation($scope.user, $scope.events.reserved, $scope.selectedPlan);
return Price.compute(mkRequestParams(r, $scope.coupon.applied), function (res) {
- $scope.amountTotal = res.price
- $scope.totalNoCoupon = res.price_without_coupon
- return setSlotsDetails(res.details)
- })
+ $scope.amountTotal = res.price;
+ $scope.totalNoCoupon = res.price_without_coupon;
+ return setSlotsDetails(res.details);
+ });
} else {
// otherwise we alert, this error musn't occur when the current user is not admin
- growl.warning(_t('cart.please_select_a_member_first'))
- return $scope.amountTotal = null
+ growl.warning(_t('cart.please_select_a_member_first'));
+ return $scope.amountTotal = null;
}
- }
+ };
var setSlotsDetails = function (details) {
angular.forEach($scope.events.reserved, function (slot) {
angular.forEach(details.slots, function (s) {
if (moment(s.start_at).isSame(slot.start)) {
- slot.promo = s.promo
- return slot.price = s.price
+ slot.promo = s.promo;
+ return slot.price = s.price;
}
- })
- })
- }
+ });
+ });
+ };
/**
* Format the parameters expected by /api/prices/compute or /api/reservations and return the resulting object
@@ -430,8 +430,8 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
return {
reservation,
coupon_code: ((coupon ? coupon.code : undefined))
- }
- }
+ };
+ };
/**
* Create an hash map implementing the Reservation specs
@@ -447,18 +447,18 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
reservable_type: $scope.reservableType,
slots_attributes: [],
plan_id: ((plan ? plan.id : undefined))
- }
+ };
angular.forEach(slots, function (slot, key) {
reservation.slots_attributes.push({
start_at: slot.start,
end_at: slot.end,
availability_id: slot.availability_id,
offered: slot.offered || false
- })
- })
+ });
+ });
- return reservation
- }
+ return reservation;
+ };
/**
* Open a modal window that allows the user to process a credit card payment for his current shopping cart.
@@ -469,79 +469,79 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
size: 'md',
resolve: {
reservation () {
- return reservation
+ return reservation;
},
price () {
- return Price.compute(mkRequestParams(reservation, $scope.coupon.applied)).$promise
+ return Price.compute(mkRequestParams(reservation, $scope.coupon.applied)).$promise;
},
wallet () {
- return Wallet.getWalletByUser({ user_id: reservation.user_id }).$promise
+ return Wallet.getWalletByUser({ user_id: reservation.user_id }).$promise;
},
cgv () {
- return CustomAsset.get({ name: 'cgv-file' }).$promise
+ return CustomAsset.get({ name: 'cgv-file' }).$promise;
},
coupon () {
- return $scope.coupon.applied
+ return $scope.coupon.applied;
}
},
controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'cgv', 'Auth', 'Reservation', 'wallet', 'helpers', '$filter', 'coupon',
function ($scope, $uibModalInstance, $state, reservation, price, cgv, Auth, Reservation, wallet, helpers, $filter, coupon) {
// user wallet amount
- $scope.walletAmount = wallet.amount
+ $scope.walletAmount = wallet.amount;
// Price
- $scope.amount = helpers.getAmountToPay(price.price, wallet.amount)
+ $scope.amount = helpers.getAmountToPay(price.price, wallet.amount);
// CGV
- $scope.cgv = cgv.custom_asset
+ $scope.cgv = cgv.custom_asset;
// Reservation
- $scope.reservation = reservation
+ $scope.reservation = reservation;
// Used in wallet info template to interpolate some translations
- $scope.numberFilter = $filter('number')
+ $scope.numberFilter = $filter('number');
/**
* Callback to process the payment with Stripe, triggered on button click
*/
$scope.payment = function (status, response) {
if (response.error) {
- growl.error(response.error.message)
+ growl.error(response.error.message);
} else {
- $scope.attempting = true
- $scope.reservation.card_token = response.id
+ $scope.attempting = true;
+ $scope.reservation.card_token = response.id;
Reservation.save(
mkRequestParams($scope.reservation, coupon),
- function (reservation) { $uibModalInstance.close(reservation) },
+ function (reservation) { $uibModalInstance.close(reservation); },
function (response) {
- $scope.alerts = []
+ $scope.alerts = [];
if (response.status === 500) {
$scope.alerts.push({
msg: response.statusText,
type: 'danger'
- })
+ });
} else {
if (response.data.card && (response.data.card.join('').length > 0)) {
$scope.alerts.push({
msg: response.data.card.join('. '),
type: 'danger'
- })
+ });
} else if (response.data.payment && (response.data.payment.join('').length > 0)) {
$scope.alerts.push({
msg: response.data.payment.join('. '),
type: 'danger'
- })
+ });
}
}
- return $scope.attempting = false
+ return $scope.attempting = false;
}
- )
+ );
}
- }
+ };
}
]
- }).result['finally'](null).then(function (reservation) { afterPayment(reservation) })
- }
+ }).result['finally'](null).then(function (reservation) { afterPayment(reservation); });
+ };
/**
* Open a modal window that allows the user to process a local payment for his current shopping cart (admin only).
*/
@@ -551,43 +551,43 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
size: 'sm',
resolve: {
reservation () {
- return reservation
+ return reservation;
},
price () {
- return Price.compute(mkRequestParams(reservation, $scope.coupon.applied)).$promise
+ return Price.compute(mkRequestParams(reservation, $scope.coupon.applied)).$promise;
},
wallet () {
- return Wallet.getWalletByUser({ user_id: reservation.user_id }).$promise
+ return Wallet.getWalletByUser({ user_id: reservation.user_id }).$promise;
},
coupon () {
- return $scope.coupon.applied
+ return $scope.coupon.applied;
}
},
controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'Auth', 'Reservation', 'wallet', 'helpers', '$filter', 'coupon',
function ($scope, $uibModalInstance, $state, reservation, price, Auth, Reservation, wallet, helpers, $filter, coupon) {
// user wallet amount
- $scope.walletAmount = wallet.amount
+ $scope.walletAmount = wallet.amount;
// Global price (total of all items)
- $scope.price = price.price
+ $scope.price = price.price;
// Price to pay (wallet deducted)
- $scope.amount = helpers.getAmountToPay(price.price, wallet.amount)
+ $scope.amount = helpers.getAmountToPay(price.price, wallet.amount);
// Reservation
- $scope.reservation = reservation
+ $scope.reservation = reservation;
// Used in wallet info template to interpolate some translations
- $scope.numberFilter = $filter('number')
+ $scope.numberFilter = $filter('number');
// Button label
if ($scope.amount > 0) {
- $scope.validButtonName = _t('cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }, 'messageformat')
+ $scope.validButtonName = _t('cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }, 'messageformat');
} else {
if ((price.price > 0) && ($scope.walletAmount === 0)) {
- $scope.validButtonName = _t('cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')(price.price) }, 'messageformat')
+ $scope.validButtonName = _t('cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')(price.price) }, 'messageformat');
} else {
- $scope.validButtonName = _t('confirm')
+ $scope.validButtonName = _t('confirm');
}
}
@@ -595,40 +595,40 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs',
* Callback to process the local payment, triggered on button click
*/
$scope.ok = function () {
- $scope.attempting = true
+ $scope.attempting = true;
return Reservation.save(mkRequestParams($scope.reservation, coupon), function (reservation) {
- $uibModalInstance.close(reservation)
- return $scope.attempting = true
+ $uibModalInstance.close(reservation);
+ return $scope.attempting = true;
}
, function (response) {
- $scope.alerts = []
- $scope.alerts.push({ msg: _t('cart.a_problem_occured_during_the_payment_process_please_try_again_later'), type: 'danger' })
- return $scope.attempting = false
- })
- }
- $scope.cancel = function () { $uibModalInstance.dismiss('cancel') }
+ $scope.alerts = [];
+ $scope.alerts.push({ msg: _t('cart.a_problem_occured_during_the_payment_process_please_try_again_later'), type: 'danger' });
+ return $scope.attempting = false;
+ });
+ };
+ $scope.cancel = function () { $uibModalInstance.dismiss('cancel'); };
}
]
- }).result['finally'](null).then(function (reservation) { afterPayment(reservation) })
- }
+ }).result['finally'](null).then(function (reservation) { afterPayment(reservation); });
+ };
/**
* Actions to run after the payment was successfull
*/
var afterPayment = function (reservation) {
// we set the cart content as 'paid' to display a summary of the transaction
- $scope.events.paid = $scope.events.reserved
+ $scope.events.paid = $scope.events.reserved;
// we call the external callback if present
- if (typeof $scope.afterPayment === 'function') { $scope.afterPayment(reservation) }
+ if (typeof $scope.afterPayment === 'function') { $scope.afterPayment(reservation); }
// we reset the coupon and the cart content and we unselect the slot
- $scope.events.reserved = []
- $scope.coupon.applied = null
- $scope.slot = null
- return $scope.selectedPlan = null
- }
+ $scope.events.reserved = [];
+ $scope.coupon.applied = null;
+ $scope.slot = null;
+ return $scope.selectedPlan = null;
+ };
// !!! MUST BE CALLED AT THE END of the directive
- return initialize()
+ return initialize();
}
- })
+ });
}
-])
+]);
diff --git a/app/assets/javascripts/directives/confirmation_needed.js b/app/assets/javascripts/directives/confirmation_needed.js
index 44316c79e..e6b3be8e8 100644
--- a/app/assets/javascripts/directives/confirmation_needed.js
+++ b/app/assets/javascripts/directives/confirmation_needed.js
@@ -14,25 +14,25 @@ Application.Directives.directive('confirmationNeeded', [() =>
priority: 1,
terminal: true,
link (scope, element, attrs) {
- const msg = attrs.confirmationNeeded || 'Are you sure?'
- const clickAction = attrs.ngClick
+ const msg = attrs.confirmationNeeded || 'Are you sure?';
+ const clickAction = attrs.ngClick;
return element.bind('click', function () {
if (attrs.confirmationNeededIf != null) {
- const confirmNeededIf = scope.$eval(attrs.confirmationNeededIf)
+ const confirmNeededIf = scope.$eval(attrs.confirmationNeededIf);
if (confirmNeededIf === true) {
if (window.confirm(msg)) {
- return scope.$eval(clickAction)
+ return scope.$eval(clickAction);
}
} else {
- return scope.$eval(clickAction)
+ return scope.$eval(clickAction);
}
} else {
if (window.confirm(msg)) {
- return scope.$eval(clickAction)
+ return scope.$eval(clickAction);
}
}
- })
+ });
}
})
-])
+]);
diff --git a/app/assets/javascripts/directives/coupon.js.erb b/app/assets/javascripts/directives/coupon.js.erb
index 504582f22..fe0c0f861 100644
--- a/app/assets/javascripts/directives/coupon.js.erb
+++ b/app/assets/javascripts/directives/coupon.js.erb
@@ -22,54 +22,54 @@ Application.Directives.directive('coupon', [ '$rootScope', 'Coupon', '_t', funct
link ($scope, element, attributes) {
// Whether code input is shown or not (ie. the link 'I have a coupon' is shown)
$scope.code =
- { input: false }
+ { input: false };
// Available status are: 'pending', 'valid', 'invalid'
- $scope.status = 'pending'
+ $scope.status = 'pending';
// Binding for the code inputed (see the attached template)
- $scope.couponCode = null
+ $scope.couponCode = null;
// Code validation messages
- $scope.messages = []
+ $scope.messages = [];
// Re-compute if the code can be applied when the total of the cart changes
$scope.$watch('total', function (newValue, oldValue) {
if (newValue && (newValue !== oldValue) && $scope.couponCode) {
- return $scope.validateCode()
+ return $scope.validateCode();
}
- })
+ });
/**
* Callback to validate the code
*/
$scope.validateCode = function () {
- $scope.messages = []
+ $scope.messages = [];
if ($scope.couponCode === '') {
- $scope.status = 'pending'
- return $scope.coupon = null
+ $scope.status = 'pending';
+ return $scope.coupon = null;
} else {
return Coupon.validate({ code: $scope.couponCode, user_id: $scope.userId, amount: $scope.total }, function (res) {
- $scope.status = 'valid'
- $scope.coupon = res
+ $scope.status = 'valid';
+ $scope.coupon = res;
if (res.type === 'percent_off') {
- return $scope.messages.push({ type: 'success', message: _t('the_coupon_has_been_applied_you_get_PERCENT_discount', { PERCENT: res.percent_off }) })
+ return $scope.messages.push({ type: 'success', message: _t('the_coupon_has_been_applied_you_get_PERCENT_discount', { PERCENT: res.percent_off }) });
} else {
- return $scope.messages.push({ type: 'success', message: _t('the_coupon_has_been_applied_you_get_AMOUNT_CURRENCY', { AMOUNT: res.amount_off, CURRENCY: $rootScope.currencySymbol }) })
+ return $scope.messages.push({ type: 'success', message: _t('the_coupon_has_been_applied_you_get_AMOUNT_CURRENCY', { AMOUNT: res.amount_off, CURRENCY: $rootScope.currencySymbol }) });
}
}
, function (err) {
- $scope.status = 'invalid'
- $scope.coupon = null
- return $scope.messages.push({ type: 'danger', message: _t(`unable_to_apply_the_coupon_because_${err.data.status}`) })
- })
+ $scope.status = 'invalid';
+ $scope.coupon = null;
+ return $scope.messages.push({ type: 'danger', message: _t(`unable_to_apply_the_coupon_because_${err.data.status}`) });
+ });
}
- }
+ };
/**
* Callback to remove the message at provided index from the displayed list
*/
- $scope.closeMessage = function (index) { $scope.messages.splice(index, 1) }
+ $scope.closeMessage = function (index) { $scope.messages.splice(index, 1); };
}
- })
-}])
+ });
+}]);
diff --git a/app/assets/javascripts/directives/directives.js b/app/assets/javascripts/directives/directives.js
index 9eb2359ed..c6e30f5e3 100644
--- a/app/assets/javascripts/directives/directives.js
+++ b/app/assets/javascripts/directives/directives.js
@@ -9,7 +9,7 @@
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
Application.Directives.directive('fileread', [ () =>
({
@@ -20,11 +20,11 @@ Application.Directives.directive('fileread', [ () =>
link (scope, element, attributes) {
return element.bind('change', changeEvent =>
scope.$apply(() => scope.fileread = changeEvent.target.files[0])
- )
+ );
}
})
-])
+]);
// This `bsHolder` angular directive is a workaround for
// an incompatability between angular and the holder.js
@@ -38,11 +38,11 @@ Application.Directives.directive('bsHolder', [ () =>
.addTheme('icon-xs', { background: 'white', foreground: '#e0e0e0', size: 20, font: 'FontAwesome' })
.addTheme('icon-black-xs', { background: 'black', foreground: 'white', size: 20, font: 'FontAwesome' })
.addTheme('avatar', { background: '#eeeeee', foreground: '#555555', size: 16, font: 'FontAwesome' })
- .run(element[0])
+ .run(element[0]);
}
})
-])
+]);
Application.Directives.directive('match', [ () =>
({
@@ -53,11 +53,11 @@ Application.Directives.directive('match', [ () =>
},
link (scope, elem, attrs, ctrl) {
return scope.$watch(() => (ctrl.$pristine && angular.isUndefined(ctrl.$modelValue)) || (scope.match === ctrl.$modelValue)
- , currentValue => ctrl.$setValidity('match', currentValue))
+ , currentValue => ctrl.$setValidity('match', currentValue));
}
})
-])
+]);
Application.Directives.directive('publishProject', [ () =>
({
@@ -65,30 +65,30 @@ Application.Directives.directive('publishProject', [ () =>
link (scope, elem, attrs, ctrl) {
return elem.bind('click', function ($event) {
if ($event) {
- $event.preventDefault()
- $event.stopPropagation()
+ $event.preventDefault();
+ $event.stopPropagation();
}
- if (elem.attr('disabled')) { return }
- const input = angular.element('')
- const form = angular.element('form')
- form.append(input)
- form.triggerHandler('submit')
- return form[0].submit()
- })
+ if (elem.attr('disabled')) { return; }
+ const input = angular.element('');
+ const form = angular.element('form');
+ form.append(input);
+ form.triggerHandler('submit');
+ return form[0].submit();
+ });
}
})
-])
+]);
Application.Directives.directive('disableAnimation', ['$animate', ($animate) =>
({
restrict: 'A',
link (scope, elem, attrs) {
- return attrs.$observe('disableAnimation', value => $animate.enabled(!value, elem))
+ return attrs.$observe('disableAnimation', value => $animate.enabled(!value, elem));
}
})
-])
+]);
/**
* Isolate a form's scope from its parent : no nested validation
@@ -98,34 +98,34 @@ Application.Directives.directive('isolateForm', [ () =>
restrict: 'A',
require: '?form',
link (scope, elm, attrs, ctrl) {
- if (!ctrl) { return }
+ if (!ctrl) { return; }
// Do a copy of the controller
- const ctrlCopy = {}
- angular.copy(ctrl, ctrlCopy)
+ const ctrlCopy = {};
+ angular.copy(ctrl, ctrlCopy);
// Get the form's parent
- const parent = elm.parent().controller('form')
+ const parent = elm.parent().controller('form');
// Remove parent link to the controller
- parent.$removeControl(ctrl)
+ parent.$removeControl(ctrl);
// Replace form controller with a "isolated form"
const isolatedFormCtrl = {
$setValidity (validationToken, isValid, control) {
- ctrlCopy.$setValidity(validationToken, isValid, control)
- return parent.$setValidity(validationToken, true, ctrl)
+ ctrlCopy.$setValidity(validationToken, isValid, control);
+ return parent.$setValidity(validationToken, true, ctrl);
},
$setDirty () {
- elm.removeClass('ng-pristine').addClass('ng-dirty')
- ctrl.$dirty = true
- return ctrl.$pristine = false
+ elm.removeClass('ng-pristine').addClass('ng-dirty');
+ ctrl.$dirty = true;
+ return ctrl.$pristine = false;
}
- }
+ };
- return angular.extend(ctrl, isolatedFormCtrl)
+ return angular.extend(ctrl, isolatedFormCtrl);
}
})
-])
+]);
diff --git a/app/assets/javascripts/directives/fab_user_avatar.js.erb b/app/assets/javascripts/directives/fab_user_avatar.js.erb
index e11a94a6e..4fdac5c1e 100644
--- a/app/assets/javascripts/directives/fab_user_avatar.js.erb
+++ b/app/assets/javascripts/directives/fab_user_avatar.js.erb
@@ -16,5 +16,5 @@ Application.Directives.directive('fabUserAvatar', [ function () {
avatarClass: '@'
},
templateUrl: '<%= asset_path "shared/_user_avatar.html" %>'
- })
-}])
+ });
+}]);
diff --git a/app/assets/javascripts/directives/selectMember.js.erb b/app/assets/javascripts/directives/selectMember.js.erb
index 06466cfb4..aeaaeb4bf 100644
--- a/app/assets/javascripts/directives/selectMember.js.erb
+++ b/app/assets/javascripts/directives/selectMember.js.erb
@@ -9,7 +9,7 @@
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
/**
* This directive will allow to select a member.
@@ -26,23 +26,23 @@ Application.Directives.directive('selectMember', [ 'Diacritics', 'Member', funct
link (scope, element, attributes) {
return scope.autoCompleteName = function (nameLookup) {
if (!nameLookup) {
- return
+ return;
}
- scope.isLoadingMembers = true
- const asciiName = Diacritics.remove(nameLookup)
+ scope.isLoadingMembers = true;
+ const asciiName = Diacritics.remove(nameLookup);
- const q = { query: asciiName }
+ const q = { query: asciiName };
if (attributes.subscription) {
- q['subscription'] = attributes.subscription
+ q['subscription'] = attributes.subscription;
}
return Member.search(q, function (users) {
- scope.matchingMembers = users
- return scope.isLoadingMembers = false
+ scope.matchingMembers = users;
+ return scope.isLoadingMembers = false;
}
- , function (error) { console.error(error) })
- }
+ , function (error) { console.error(error); });
+ };
}
- })
-}])
+ });
+}]);
diff --git a/app/assets/javascripts/directives/socialLink.js.erb b/app/assets/javascripts/directives/socialLink.js.erb
index ecae030e7..2ad7f7040 100644
--- a/app/assets/javascripts/directives/socialLink.js.erb
+++ b/app/assets/javascripts/directives/socialLink.js.erb
@@ -19,18 +19,18 @@ Application.Directives.directive('socialLink', [ function () {
templateUrl: '<%= asset_path "shared/_social_link.html" %>',
link (scope, element, attributes) {
if (scope.network === 'dailymotion') {
- scope.image = "<%= asset_path('social/dailymotion.png') %>"
- return scope.altText = 'd'
+ scope.image = "<%= asset_path('social/dailymotion.png') %>";
+ return scope.altText = 'd';
} else if (scope.network === 'echosciences') {
- scope.image = "<%= asset_path('social/echosciences.png') %>"
- return scope.altText = 'E)'
+ scope.image = "<%= asset_path('social/echosciences.png') %>";
+ return scope.altText = 'E)';
} else {
if (scope.network === 'website') {
- return scope.faClass = 'fa-globe'
+ return scope.faClass = 'fa-globe';
} else {
- return scope.faClass = `fa-${scope.network.replace('_', '-')}`
+ return scope.faClass = `fa-${scope.network.replace('_', '-')}`;
}
}
}
- })
-}])
+ });
+}]);
diff --git a/app/assets/javascripts/directives/stripe-angular.js b/app/assets/javascripts/directives/stripe-angular.js
index 2fdc9a0b2..7ae4831a8 100644
--- a/app/assets/javascripts/directives/stripe-angular.js
+++ b/app/assets/javascripts/directives/stripe-angular.js
@@ -1,23 +1,23 @@
-'use strict'
+'use strict';
// https://github.com/gtramontina/stripe-angular
Application.Directives.directive('stripeForm', ['$window',
function ($window) {
- var directive = { restrict: 'A' }
+ var directive = { restrict: 'A' };
directive.link = function (scope, element, attributes) {
- var form = angular.element(element)
+ var form = angular.element(element);
form.bind('submit', function () {
- var button = form.find('button')
- button.prop('disabled', true)
+ var button = form.find('button');
+ button.prop('disabled', true);
$window.Stripe.createToken(form[0], function () {
- var args = arguments
+ var args = arguments;
scope.$apply(function () {
- scope[attributes.stripeForm].apply(scope, args)
- })
+ scope[attributes.stripeForm].apply(scope, args);
+ });
// button.prop('disabled', false);
- })
- })
- }
- return directive
- }])
+ });
+ });
+ };
+ return directive;
+ }]);
diff --git a/app/assets/javascripts/directives/validators.js b/app/assets/javascripts/directives/validators.js
index 29c558ffb..567e24d3b 100644
--- a/app/assets/javascripts/directives/validators.js
+++ b/app/assets/javascripts/directives/validators.js
@@ -10,46 +10,46 @@
* DS102: Remove unnecessary code created because of implicit returns
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
Application.Directives.directive('url', [ function () {
- const URL_REGEXP = /^(https?:\/\/)([\da-z\.-]+)\.([-a-z0-9\.]{2,30})([\/\w \.-]*)*\/?$/
+ const URL_REGEXP = /^(https?:\/\/)([\da-z\.-]+)\.([-a-z0-9\.]{2,30})([\/\w \.-]*)*\/?$/;
return {
require: 'ngModel',
link (scope, element, attributes, ctrl) {
return ctrl.$validators.url = function (modelValue, viewValue) {
if (ctrl.$isEmpty(modelValue)) {
- return true
+ return true;
}
if (URL_REGEXP.test(viewValue)) {
- return true
+ return true;
}
// otherwise, this is invalid
- return false
- }
+ return false;
+ };
}
- }
+ };
}
-])
+]);
Application.Directives.directive('endpoint', [ function () {
- const ENDPOINT_REGEXP = /^\/?([-._~:?#\[\]@!$&'()*+,;=%\w]+\/?)*$/
+ const ENDPOINT_REGEXP = /^\/?([-._~:?#\[\]@!$&'()*+,;=%\w]+\/?)*$/;
return {
require: 'ngModel',
link (scope, element, attributes, ctrl) {
return ctrl.$validators.endpoint = function (modelValue, viewValue) {
if (ctrl.$isEmpty(modelValue)) {
- return true
+ return true;
}
if (ENDPOINT_REGEXP.test(viewValue)) {
- return true
+ return true;
}
// otherwise, this is invalid
- return false
- }
+ return false;
+ };
}
- }
+ };
}
-])
+]);
diff --git a/app/assets/javascripts/filters/filters.js b/app/assets/javascripts/filters/filters.js
index 916e069ad..a79139bb7 100644
--- a/app/assets/javascripts/filters/filters.js
+++ b/app/assets/javascripts/filters/filters.js
@@ -11,142 +11,142 @@
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
-'use strict'
+'use strict';
Application.Filters.filter('array', [ () =>
function (arrayLength) {
if (arrayLength) {
- arrayLength = Math.ceil(arrayLength)
- const arr = new Array(arrayLength)
+ arrayLength = Math.ceil(arrayLength);
+ const arr = new Array(arrayLength);
for (let i = 0, end = arrayLength, asc = end >= 0; asc ? i < end : i > end; asc ? i++ : i--) {
- arr[i] = i
+ arr[i] = i;
}
- return arr
+ return arr;
}
}
-])
+]);
// filter for projects and trainings
Application.Filters.filter('machineFilter', [ () =>
function (elements, selectedMachine) {
if (!angular.isUndefined(elements) && !angular.isUndefined(selectedMachine) && (elements != null) && (selectedMachine != null)) {
- const filteredElements = []
+ const filteredElements = [];
angular.forEach(elements, function (element) {
if (element.machine_ids.indexOf(selectedMachine) !== -1) {
- return filteredElements.push(element)
+ return filteredElements.push(element);
}
- })
- return filteredElements
+ });
+ return filteredElements;
} else {
- return elements
+ return elements;
}
}
-])
+]);
Application.Filters.filter('projectMemberFilter', [ 'Auth', Auth =>
function (projects, selectedMember) {
if (!angular.isUndefined(projects) && angular.isDefined(selectedMember) && (projects != null) && (selectedMember != null) && (selectedMember !== '')) {
- const filteredProject = []
+ const filteredProject = [];
// Mes projets
if (selectedMember === '0') {
angular.forEach(projects, function (project) {
if (project.author_id === Auth._currentUser.id) {
- return filteredProject.push(project)
+ return filteredProject.push(project);
}
- })
+ });
// les projets auxquels je collabore
} else {
angular.forEach(projects, function (project) {
if (project.user_ids.indexOf(Auth._currentUser.id) !== -1) {
- return filteredProject.push(project)
+ return filteredProject.push(project);
}
- })
+ });
}
- return filteredProject
+ return filteredProject;
} else {
- return projects
+ return projects;
}
}
-])
+]);
Application.Filters.filter('themeFilter', [ () =>
function (projects, selectedTheme) {
if (!angular.isUndefined(projects) && !angular.isUndefined(selectedTheme) && (projects != null) && (selectedTheme != null)) {
- const filteredProjects = []
+ const filteredProjects = [];
angular.forEach(projects, function (project) {
if (project.theme_ids.indexOf(selectedTheme) !== -1) {
- return filteredProjects.push(project)
+ return filteredProjects.push(project);
}
- })
- return filteredProjects
+ });
+ return filteredProjects;
} else {
- return projects
+ return projects;
}
}
-])
+]);
Application.Filters.filter('componentFilter', [ () =>
function (projects, selectedComponent) {
if (!angular.isUndefined(projects) && !angular.isUndefined(selectedComponent) && (projects != null) && (selectedComponent != null)) {
- const filteredProjects = []
+ const filteredProjects = [];
angular.forEach(projects, function (project) {
if (project.component_ids.indexOf(selectedComponent) !== -1) {
- return filteredProjects.push(project)
+ return filteredProjects.push(project);
}
- })
- return filteredProjects
+ });
+ return filteredProjects;
} else {
- return projects
+ return projects;
}
}
-])
+]);
Application.Filters.filter('projectsByAuthor', [ () =>
function (projects, authorId) {
if (!angular.isUndefined(projects) && angular.isDefined(authorId) && (projects != null) && (authorId != null) && (authorId !== '')) {
- const filteredProject = []
+ const filteredProject = [];
angular.forEach(projects, function (project) {
if (project.author_id === authorId) {
- return filteredProject.push(project)
+ return filteredProject.push(project);
}
- })
- return filteredProject
+ });
+ return filteredProject;
} else {
- return projects
+ return projects;
}
}
-])
+]);
Application.Filters.filter('projectsCollabored', [ () =>
function (projects, memberId) {
if (!angular.isUndefined(projects) && angular.isDefined(memberId) && (projects != null) && (memberId != null) && (memberId !== '')) {
- const filteredProject = []
+ const filteredProject = [];
angular.forEach(projects, function (project) {
if (project.user_ids.indexOf(memberId) !== -1) {
- return filteredProject.push(project)
+ return filteredProject.push(project);
}
- })
- return filteredProject
+ });
+ return filteredProject;
} else {
- return projects
+ return projects;
}
}
-])
+]);
// depend on humanize.js lib in /vendor
Application.Filters.filter('humanize', [ () =>
(element, param) => Humanize.truncate(element, param, null)
-])
+]);
/**
* This filter will convert ASCII carriage-return character to the HTML break-line tag
@@ -154,11 +154,11 @@ Application.Filters.filter('humanize', [ () =>
Application.Filters.filter('breakFilter', [ () =>
function (text) {
if (text != null) {
- return text.replace(/\n+/g, '
')
+ return text.replace(/\n+/g, '
');
}
}
-])
+]);
/**
* This filter will take a HTML text as input and will return it without the html tags
@@ -166,224 +166,224 @@ Application.Filters.filter('breakFilter', [ () =>
Application.Filters.filter('simpleText', [ () =>
function (text) {
if (text != null) {
- text = text.replace(/