} expected: $scope.provider.providable_attributes.o_auth2_mappings_attributes
+# @returns {Boolean} true if the mapping is declared
+##
+check_oauth2_id_is_mapped = (mappings) ->
+ for mapping in mappings
+ if mapping.local_model == 'user' and mapping.local_field == 'uid' and not mapping._destroy
+ return true
+ return false
+
+
+
+##
+# Page listing all authentication providers
+##
+Application.Controllers.controller "AuthentificationController", ["$scope", "$state", "$rootScope", "dialogs", "growl", "authProvidersPromise", 'AuthProvider', '_t'
+, ($scope, $state, $rootScope, dialogs, growl, authProvidersPromise, AuthProvider, _t) ->
+
+ ### PUBLIC SCOPE ###
+
+ ## full list of authentication providers
+ $scope.providers = authProvidersPromise
+
+
+
+ ##
+ # Translate the classname into an explicit textual message
+ # @param type {string} Ruby polymorphic model classname
+ # @returns {string}
+ ##
+ $scope.getType = (type) ->
+ text = METHODS[type]
+ if typeof text != 'undefined'
+ return text
+ else
+ return _t('unknown')+type
+
+
+
+ ##
+ # Translate the status string into an explicit textual message
+ # @param status {string} active | pending | previous
+ # @returns {string}
+ ##
+ $scope.getState = (status) ->
+ switch status
+ when 'active' then _t('active')
+ when 'pending' then _t('pending')
+ when 'previous' then _t('previous_provider')
+ else _t('unknown')+status
+
+
+
+ ##
+ # Ask for confirmation then delete the specified provider
+ # @param providers {Array} full list of authentication providers
+ # @param provider {Object} provider to delete
+ ##
+ $scope.destroyProvider = (providers, provider) ->
+ dialogs.confirm
+ resolve:
+ object: ->
+ title: _t('confirmation_required')
+ msg: _t('do_you_really_want_to_delete_the_TYPE_authentication_provider_NAME', {TYPE:$scope.getType(provider.providable_type), NAME:provider.name})
+ , ->
+ # the admin has confirmed, delete
+ AuthProvider.delete id: provider.id
+ , ->
+ providers.splice(findIdxById(providers, provider.id), 1)
+ growl.success(_t('authentication_provider_successfully_deleted'))
+ , ->
+ growl.error(_t('an_error_occurred_unable_to_delete_the_specified_provider'))
+
+]
+
+
+
+##
+# Page to add a new authentication provider
+##
+Application.Controllers.controller "NewAuthenticationController", ["$scope", "$state", "$rootScope", "dialogs", "growl", "mappingFieldsPromise", "authProvidersPromise", "AuthProvider", '_t'
+, ($scope, $state, $rootScope, dialogs, growl, mappingFieldsPromise, authProvidersPromise, AuthProvider, _t) ->
+
+ $scope.authMethods = METHODS
+
+ $scope.mappingFields = mappingFieldsPromise
+
+ $scope.mode = 'creation'
+
+ $scope.provider = {
+ name: '',
+ providable_type: '',
+ providable_attributes: {}
+ }
+
+
+ ##
+ # Initialize some provider's specific properties when selecting the provider type
+ ##
+ $scope.updateProvidable = ->
+ # === OAuth2Provider ===
+ if $scope.provider.providable_type == 'OAuth2Provider'
+ if typeof $scope.provider.providable_attributes.o_auth2_mappings_attributes == 'undefined'
+ $scope.provider.providable_attributes['o_auth2_mappings_attributes'] = []
+ # Add others providers initializers here if needed ...
+
+
+
+ ##
+ # Validate and save the provider parameters in database
+ ##
+ $scope.registerProvider = ->
+ # === DatabaseProvider ===
+ if $scope.provider.providable_type == 'DatabaseProvider'
+ # prevent from adding mode than 1
+ for provider in authProvidersPromise
+ if provider.providable_type == 'DatabaseProvider'
+ growl.error _t('a_local_database_provider_already_exists_unable_to_create_another')
+ return false
+ AuthProvider.save auth_provider: $scope.provider, (provider) ->
+ growl.success _t('local_provider_successfully_saved')
+ $state.go('app.admin.members')
+ # === OAuth2Provider ===
+ else if $scope.provider.providable_type == 'OAuth2Provider'
+ # check the ID mapping
+ unless check_oauth2_id_is_mapped($scope.provider.providable_attributes.o_auth2_mappings_attributes)
+ growl.error(_t('it_is_required_to_set_the_matching_between_User.uid_and_the_API_to_add_this_provider'))
+ return false
+ # discourage the use of unsecure SSO
+ unless $scope.provider.providable_attributes.base_url.indexOf('https://') > -1
+ dialogs.confirm
+ size: 'l'
+ resolve:
+ object: ->
+ title: _t('security_issue_detected')
+ msg: _t('beware_the_oauth2_authenticatoin_provider_you_are_about_to_add_isnt_using_HTTPS') +
+ _t('this_is_a_serious_security_issue_on_internet_and_should_never_be_used_except_for_testing_purposes') +
+ _t('do_you_really_want_to_continue')
+ , -> # unsecured http confirmed
+ AuthProvider.save auth_provider: $scope.provider, (provider) ->
+ growl.success _t('unsecured_oauth2_provider_successfully_added')
+ $state.go('app.admin.members')
+ else
+ AuthProvider.save auth_provider: $scope.provider, (provider) ->
+ growl.success _t('oauth2_provider_successfully_added')
+ $state.go('app.admin.members')
+
+
+
+ ##
+ # Changes the admin's view to the members list page
+ ##
+ $scope.cancel = ->
+ $state.go('app.admin.members')
+
+]
+
+
+
+##
+# Page to edit an already added authentication provider
+##
+Application.Controllers.controller "EditAuthenticationController", ["$scope", "$state", "$stateParams", "$rootScope", "dialogs", "growl", 'providerPromise', 'mappingFieldsPromise', 'AuthProvider', '_t'
+, ($scope, $state, $stateParams, $rootScope, dialogs, growl, providerPromise, mappingFieldsPromise, AuthProvider, _t) ->
+
+ $scope.provider = providerPromise
+
+ $scope.authMethods = METHODS
+
+ $scope.mode = 'edition'
+
+ $scope.mappingFields = mappingFieldsPromise
+
+ ##
+ # Update the current provider with the new inputs
+ ##
+ $scope.updateProvider = ->
+ # check the ID mapping
+ unless check_oauth2_id_is_mapped($scope.provider.providable_attributes.o_auth2_mappings_attributes)
+ growl.error(_t('it_is_required_to_set_the_matching_between_User.uid_and_the_API_to_add_this_provider'))
+ return false
+ AuthProvider.update {id: $scope.provider.id}, {auth_provider: $scope.provider}, (provider) ->
+ growl.success(_t('provider_successfully_updated'))
+ $state.go('app.admin.members')
+ , ->
+ growl.error(_t('an_error_occurred_unable_to_update_the_provider'))
+
+ ##
+ # Changes the admin's view to the members list page
+ ##
+ $scope.cancel = ->
+ $state.go('app.admin.members')
+
+]
\ No newline at end of file
diff --git a/app/assets/javascripts/controllers/admin/calendar.coffee.erb b/app/assets/javascripts/controllers/admin/calendar.coffee.erb
new file mode 100644
index 000000000..81e38b54f
--- /dev/null
+++ b/app/assets/javascripts/controllers/admin/calendar.coffee.erb
@@ -0,0 +1,403 @@
+'use strict'
+
+##
+# Controller used in the calendar management page
+##
+
+Application.Controllers.controller "AdminCalendarController", ["$scope", "$state", "$uibModal", "moment", "Availability", 'Slot', 'Setting', 'growl', 'dialogs', 'availabilitiesPromise', 'bookingWindowStart', 'bookingWindowEnd', 'machinesPromise', '_t'
+($scope, $state, $uibModal, moment, Availability, Slot, Setting, growl, dialogs, availabilitiesPromise, bookingWindowStart, bookingWindowEnd, machinesPromise, _t) ->
+
+
+
+ ### PRIVATE STATIC CONSTANTS ###
+
+ # The calendar is divided in slots of 30 minutes
+ BASE_SLOT = '00:30:00'
+
+ # The bookings can be positioned every half hours
+ BOOKING_SNAP = '00:30:00'
+
+ # The calendar will be initialized positioned under 9:00 AM
+ DEFAULT_CALENDAR_POSITION = '09:00:00'
+
+ # We do not allow the creation of slots that are not a multiple of 60 minutes
+ SLOT_MULTIPLE = 60
+
+
+
+ ### PUBLIC SCOPE ###
+
+ ## list of the FabLab machines
+ $scope.machines = machinesPromise
+
+ ## currently selected availability
+ $scope.availability = null
+
+ ## bind the availabilities slots with full-Calendar events
+ $scope.eventSources = []
+ $scope.eventSources.push
+ events: availabilitiesPromise
+ textColor: 'black'
+
+ ## after fullCalendar loads, provides access to its methods through $scope.calendar.fullCalendar()
+ $scope.calendar = null
+
+ ## fullCalendar (v2) configuration
+ $scope.calendarConfig =
+ timezone: Fablab.timezone
+ lang: Fablab.fullcalendar_locale
+ header:
+ left: 'month agendaWeek'
+ center: 'title'
+ right: 'today prev,next'
+ firstDay: 1 # Week start on monday (France)
+ scrollTime: DEFAULT_CALENDAR_POSITION
+ slotDuration: BASE_SLOT
+ snapDuration: BOOKING_SNAP
+ allDayDefault: false
+ minTime: "00:00:00"
+ maxTime: "24:00:00"
+ height: 'auto'
+ buttonIcons:
+ prev: 'left-single-arrow'
+ next: 'right-single-arrow'
+ timeFormat:
+ agenda:'H:mm'
+ month: 'H(:mm)'
+ axisFormat: 'H:mm'
+
+ allDaySlot: false
+ defaultView: 'agendaWeek'
+ selectable: true
+ selecHelper: true
+ select: (start, end, jsEvent, view) ->
+ calendarSelectCb(start, end, jsEvent, view)
+ eventClick: (event, jsEvent, view)->
+ calendarEventClickCb(event, jsEvent, view)
+ eventRender: (event, element, view) ->
+ eventRenderCb(event, element)
+
+ ## fullCalendar time bounds (up & down)
+ $scope.calendarConfig.minTime = moment.duration(moment(bookingWindowStart.setting.value).format('HH:mm:ss'))
+ $scope.calendarConfig.maxTime = moment.duration(moment(bookingWindowEnd.setting.value).format('HH:mm:ss'))
+
+
+
+ ##
+ # Open a confirmation modal to cancel the booking of a user for the currently selected event.
+ # @param slot {Object} reservation slot of a user, inherited from $resource
+ ##
+ $scope.cancelBooking = (slot) ->
+ # open a confirmation dialog
+ dialogs.confirm
+ resolve:
+ object: ->
+ title: _t('confirmation_required')
+ msg: _t("do_you_really_want_to_cancel_the_USER_s_reservation_the_DATE_at_TIME_concerning_RESERVATION"
+ , { GENDER:getGender($scope.currentUser), USER:slot.user.name, DATE:moment(slot.start_at).format('L'), TIME:moment(slot.start_at).format('LT'), RESERVATION:slot.reservable.name }
+ , 'messageformat')
+ , ->
+ # the admin has confirmed, cancel the subscription
+ Slot.cancel {id: slot.slot_id}
+ , (data, status) -> # success
+ # update the canceled_at attribute
+ for resa in $scope.reservations
+ if resa.slot_id == data.id
+ resa.canceled_at = data.canceled_at
+ break
+ # notify the admin
+ growl.success(_t('reservation_was_successfully_cancelled'))
+ , (data, status) -> # failed
+ growl.error(_t('reservation_cancellation_failed'))
+
+
+
+ ##
+ # Open a confirmation modal to remove a machine for the currently selected availability,
+ # except if it is the last machine of the reservation.
+ # @param machine {Object} must contain the machine ID and name
+ ##
+ $scope.removeMachine = (machine) ->
+ if $scope.availability.machine_ids.length == 1
+ growl.error(_t('unable_to_remove_the_last_machine_of_the_slot_delete_the_slot_rather'))
+ else
+ # open a confirmation dialog
+ dialogs.confirm
+ resolve:
+ object: ->
+ title: _t('confirmation_required')
+ msg: _t('do_you_really_want_to_remove_MACHINE_from_this_slot', {GENDER:getGender($scope.currentUser), MACHINE:machine.name}, "messageformat") + ' ' +
+ _t('this_will_prevent_any_new_reservation_on_this_slot_but_wont_cancel_those_existing') + ' ' +
+ _t('beware_this_cannot_be_reverted')
+ , ->
+ # the admin has confirmed, remove the machine
+ machines = $scope.availability.machine_ids
+ for key, m_id in machines
+ if m_id == machine.id
+ machines.splice(key, 1)
+
+ Availability.update {id: $scope.availability.id}, {availability: {machines_attributes: [{id: machine.id, _destroy: true}]}}
+ , (data, status) -> # success
+ # update the machine_ids attribute
+ $scope.availability.machine_ids = data.machine_ids
+ $scope.availability.title = data.title
+ $scope.calendar.fullCalendar 'rerenderEvents'
+ # notify the admin
+ growl.success(_t('the_machine_was_successfully_removed_from_the_slot'))
+ , (data, status) -> # failed
+ growl.error(_t('deletion_failed'))
+
+
+
+ ### PRIVATE SCOPE ###
+
+ ##
+ # Return an enumerable meaninful string for the gender of the provider user
+ # @param user {Object} Database user record
+ # @return {string} 'male' or 'female'
+ ##
+ getGender = (user) ->
+ if user.profile
+ if user.profile.gender == "true" then 'male' else 'female'
+ else 'other'
+
+ # Triggered when the admin drag on the agenda to create a new reservable slot.
+ # @see http://fullcalendar.io/docs/selection/select_callback/
+ ##
+ calendarSelectCb = (start, end, jsEvent, view) ->
+ start = moment.tz(start.toISOString(), Fablab.timezone)
+ end = moment.tz(end.toISOString(), Fablab.timezone)
+ # first we check that the selected slot is an N-hours multiple (ie. not decimal)
+ if Number.isInteger(parseInt((end.valueOf() - start.valueOf()) / (SLOT_MULTIPLE * 1000), 10)/SLOT_MULTIPLE)
+ today = new Date()
+ if (parseInt((start.valueOf() - today) / (60 * 1000), 10) >= 0)
+ # then we open a modal window to let the admin specify the slot type
+ modalInstance = $uibModal.open
+ templateUrl: '<%= asset_path "admin/calendar/eventModal.html" %>'
+ controller: 'CreateEventModalController'
+ resolve:
+ start: -> start
+ end: -> end
+ # when the modal is closed, we send the slot to the server for saving
+ modalInstance.result.then (availability) ->
+ $scope.calendar.fullCalendar 'renderEvent',
+ id: availability.id
+ title: availability.title,
+ start: availability.start_at
+ end: availability.end_at
+ textColor: 'black'
+ backgroundColor: availability.backgroundColor
+ borderColor: availability.borderColor
+ tag_ids: availability.tag_ids
+ machine_ids: availability.machine_ids
+ , true
+ , ->
+ $scope.calendar.fullCalendar('unselect')
+
+ $scope.calendar.fullCalendar('unselect')
+
+
+
+ ##
+ # Triggered when the admin clicks on a availability slot in the agenda.
+ # @see http://fullcalendar.io/docs/mouse/eventClick/
+ ##
+ calendarEventClickCb = (event, jsEvent, view) ->
+
+ $scope.availability = event
+
+ # if the user has clicked on the delete event button, delete the event
+ if ($(jsEvent.target).hasClass('remove-event'))
+ Availability.delete id: event.id, ->
+ $scope.calendar.fullCalendar 'removeEvents', event.id
+ for _event, i in $scope.eventSources[0].events
+ if _event.id == event.id
+ $scope.eventSources[0].events.splice(i,1)
+
+ growl.success(_t('the_slot_START-END_has_been_successfully_deleted', {START:+moment(event.start).format('LL LT'), END:moment(event.end).format('LT')}))
+ ,->
+ growl.error(_t('unable_to_delete_the_slot_START-END_because_it_s_already_reserved_by_a_member', {START:+moment(event.start).format('LL LT'), END:moment(event.end).format('LT')}))
+ # if the user has only clicked on the event, display its reservations
+ else
+ Availability.reservations {id: event.id}, (reservations) ->
+ $scope.reservations = reservations
+
+
+
+
+ ##
+ # Triggered when fullCalendar tries to graphicaly render an event block.
+ # Append the event tag into the block, just after the event title.
+ # @see http://fullcalendar.io/docs/event_rendering/eventRender/
+ ##
+ eventRenderCb = (event, element) ->
+ if event.tag_ids.length > 0
+ Availability.get {id: event.id}, (avail) ->
+ html = ''
+ for tag in avail.tags
+ html += "#{tag.name} "
+ element.find('.fc-title').append(", , ...).
+ # The supported tags are , , and } trainings IDs array
+ ##
+ $scope.showTrainings = (trainings) ->
+ unless angular.isArray(trainings) and trainings.length > 0
+ return _t('none')
+
+ selected = []
+ angular.forEach $scope.trainings, (t) ->
+ if trainings.indexOf(t.id) >= 0
+ selected.push t.name
+ return if selected.length then selected.join(' | ') else _t('none')
+
+
+
+ ##
+ # Validation callback when editing training's credits. Save the changes.
+ # @param newdata {Object} training and associated plans
+ # @param planId {number|string} plan id
+ ##
+ $scope.saveTrainingCredits = (newdata, planId) ->
+ # save the number of credits
+ Plan.update {id: planId},
+ training_credit_nb: newdata.training_credits
+ , angular.noop() # do nothing in case of success
+ , (error) ->
+ growl.error(_t('an_error_occurred_while_saving_the_number_of_credits'))
+
+ # save the associated trainings
+ angular.forEach $scope.trainingCreditsGroups, (original, key) ->
+ if parseInt(key) == parseInt(planId) # we've got the original data
+ if original.join('_') != newdata.training_ids.join('_') # if any changes
+ # iterate through the previous credits to remove
+ angular.forEach original, (oldTrainingId) ->
+ if newdata.training_ids.indexOf(oldTrainingId) == -1
+ tc = findTrainingCredit(oldTrainingId, planId)
+ if tc
+ tc.$delete {}
+ , ->
+ $scope.trainingCredits.splice($scope.trainingCredits.indexOf(tc), 1)
+ $scope.trainingCreditsGroups[planId].splice($scope.trainingCreditsGroups[planId].indexOf(tc.id), 1)
+ , (error) ->
+ growl.error(_t('an_error_occurred_while_deleting_credit_with_the_TRAINING', {TRAINING:tc.creditable.name}))
+ else
+ growl.error(_t('an_error_occurred_unable_to_find_the_credit_to_revoke'))
+
+ # iterate through the new credits to add
+ angular.forEach newdata.training_ids, (newTrainingId) ->
+ if original.indexOf(newTrainingId) == -1
+ Credit.save
+ credit:
+ creditable_id: newTrainingId
+ creditable_type: 'Training'
+ plan_id: planId
+ , (newTc) -> # success
+ $scope.trainingCredits.push(newTc)
+ $scope.trainingCreditsGroups[newTc.plan_id].push(newTc.creditable_id)
+ , (error) -> # failed
+ training = getTrainingFromId(newTrainingId)
+ growl.error(_t('an_error_occurred_while_creating_credit_with_the_TRAINING', {TRAINING: training.name}))
+ console.error(error)
+
+
+
+
+ ##
+ # Cancel the current training credit modification
+ # @param rowform {Object} see http://vitalets.github.io/angular-xeditable/
+ ##
+ $scope.cancelTrainingCredit = (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 = (e)->
+ e.preventDefault()
+ e.stopPropagation()
+ $scope.inserted =
+ creditable_type: 'Machine'
+ $scope.machineCredits.push($scope.inserted)
+ $scope.status.isopen = !$scope.status.isopen
+
+
+
+ ##
+ # In the Credits tab, while editing a machine credit row, select the current machine from the
+ # drop-down list of machines as the current item.
+ # @param credit {Object} credit object, inherited from $resource
+ ##
+ $scope.showCreditableName = (credit) ->
+ selected = _t('not_set')
+ if credit and credit.creditable_id
+ angular.forEach $scope.machines, (m)->
+ if m.id == credit.creditable_id
+ selected = m.name+' ( id. '+m.id+' )'
+ return selected
+
+
+
+ ##
+ # Validation callback when editing machine's credits. Save the changes.
+ # This will prevent the creation of two credits associating the same machine and plan.
+ # @param data {Object} machine, associated plan and number of credit hours.
+ # @param [id] {number} credit id for edition, create a new credit object if not provided
+ ##
+ $scope.saveMachineCredit = (data, id) ->
+ for mc in $scope.machineCredits
+ if mc.plan_id == data.plan_id and mc.creditable_id == data.creditable_id and (id == null or mc.id != id)
+ growl.error(_t('error_a_credit_linking_this_machine_with_that_subscription_already_exists'))
+ unless id
+ $scope.machineCredits.pop()
+ return false
+
+ if id?
+ Credit.update {id: id}, credit: data, ->
+ growl.success(_t('changes_have_been_successfully_saved'))
+ else
+ data.creditable_type = 'Machine'
+ Credit.save
+ credit: data
+ , (resp) ->
+ $scope.machineCredits[$scope.machineCredits.length-1].id = resp.id
+ growl.success(_t('credit_was_successfully_saved'))
+
+
+ ##
+ # Removes the newly inserted but not saved machine credit / Cancel the current machine credit modification
+ # @param rowform {Object} see http://vitalets.github.io/angular-xeditable/
+ # @param index {number} theme index in the $scope.machineCredits array
+ ##
+ $scope.cancelMachineCredit = (rowform, index) ->
+ if $scope.machineCredits[index].id?
+ rowform.$cancel()
+ else
+ $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 = (index) ->
+ Credit.delete $scope.machineCredits[index]
+ $scope.machineCredits.splice(index, 1)
+
+
+
+ ##
+ # If the plan does not have a type, return a default value for display purposes
+ # @param type {string|undefined|null} plan's type (eg. 'partner')
+ # @returns {string}
+ ##
+ $scope.getPlanType = (type) ->
+ if type == 'PartnerPlan'
+ return _t('partner')
+ else return _t('standard')
+
+ ##
+ # Change the plans ordering criterion to the one provided
+ # @param orderBy {string} ordering criterion
+ ##
+ $scope.setOrderPlans = (orderBy) ->
+ if $scope.orderPlans == orderBy
+ $scope.orderPlans = '-'+orderBy
+ else
+ $scope.orderPlans = orderBy
+
+ ##
+ # Retrieve a price from prices array by a machineId and a groupId
+ ##
+ $scope.findPriceBy = (prices, machineId, groupId)->
+ for price in prices
+ if price.priceable_id == machineId and price.group_id == groupId
+ return price
+
+ ##
+ # update a price for a machine and a group, not considering any plan
+ ##
+ $scope.updatePrice = (data, price)->
+ if data?
+ Price.update({ id: price.id }, { price: { amount: data } }).$promise
+ else
+ _t('please_specify_a_number')
+
+ ##
+ # Delete the specified subcription plan
+ # @param id {number} plan id
+ ##
+ $scope.deletePlan = (plans, id) ->
+ if typeof id != 'number'
+ console.error('[editPricingController::deletePlan] Error: invalid id parameter')
+ else
+ # open a confirmation dialog
+ dialogs.confirm
+ resolve:
+ object: ->
+ title: _t('confirmation_required')
+ msg: _t('do_you_really_want_to_delete_this_subscription_plan')
+ , ->
+ # the admin has confirmed, delete the plan
+ Plan.delete {id: id}, (res) ->
+ growl.success(_t('subscription_plan_was_successfully_deleted'))
+ $scope.plans.splice(findPlanIdxById(plans, id), 1)
+
+ , (error) ->
+ console.error('[editPricingController::deletePlan] Error: '+error.statusText) if error.statusText
+ growl.error(_t('unable_to_delete_the_specified_subscription_an_error_occurred'))
+
+
+
+ ##
+ # Generate a string identifying the given plan by literal humain-readable name
+ # @param plan {Object} Plan object, as recovered from GET /api/plan/:id
+ # @param groups {Array} List of Groups objects, as recovered from GET /api/groups
+ # @param short {boolean} If true, the generated name will contains the group slug, otherwise the group full name
+ # will be included.
+ # @returns {String}
+ ##
+ $scope.humanReadablePlanName = (plan, groups, short)->
+ "#{$filter('humanReadablePlanName')(plan, groups, short)}"
+
+
+
+ ### PRIVATE SCOPE ###
+
+ findPlanIdxById = (plans, id)->
+ (plans.map (plan)->
+ plan.id
+ ).indexOf(id)
+
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+
+ Credit.query({creditable_type: 'Training'}).$promise.then (data)->
+ $scope.trainingCredits = data
+ $scope.trainingCreditsGroups = groupCreditsByPlan(data)
+
+ ## adds empty array for plan which hasn't any credits yet
+ for plan in $scope.plans
+ unless $scope.trainingCreditsGroups[plan.id]?
+ $scope.trainingCreditsGroups[plan.id] = []
+
+ Credit.query({creditable_type: 'Machine'}).$promise.then (data)->
+ $scope.machineCredits = data
+
+ Training.query().$promise.then (data)->
+ $scope.trainings = data
+
+ Machine.query().$promise.then (data)->
+ $scope.machines = data
+
+
+ ##
+ # Group the given credits array into a map associating the plan ID with its associated trainings/machines
+ # @return {Object} the association map
+ ##
+ groupCreditsByPlan = (credits) ->
+ creditsMap = {}
+ angular.forEach credits, (c) ->
+ unless creditsMap[c.plan_id]
+ creditsMap[c.plan_id] = []
+ creditsMap[c.plan_id].push(c.creditable_id)
+ creditsMap
+
+
+
+ ##
+ # Iterate through $scope.traininfCredits to find the credit matching the given criterion
+ # @param trainingId {number|string} training ID
+ # @param planId {number|string} plan ID
+ ##
+ findTrainingCredit = (trainingId, planId) ->
+ trainingId = parseInt(trainingId)
+ planId = parseInt(planId)
+
+ for credit in $scope.trainingCredits
+ if credit.plan_id == planId and credit.creditable_id == trainingId
+ return credit
+
+
+ ##
+ # Retrieve a training from its given identifier and returns it
+ # @param id {number} training ID
+ # @returns {Object} Training inherited from $resource
+ ##
+ getTrainingFromId = (id) ->
+ for training in $scope.trainings
+ if training.id == parseInt(id)
+ return training
+
+
+ ## !!! MUST BE CALLED AT THE END of the controller
+ initialize()
+]
diff --git a/app/assets/javascripts/controllers/admin/project_elements.coffee b/app/assets/javascripts/controllers/admin/project_elements.coffee
index e5f9e0460..67b7c25c8 100644
--- a/app/assets/javascripts/controllers/admin/project_elements.coffee
+++ b/app/assets/javascripts/controllers/admin/project_elements.coffee
@@ -1,17 +1,16 @@
'use strict'
-Application.Controllers.controller "projectElementsController", ["$scope", "$state", 'Component', 'Licence', 'Theme', ($scope, $state, Component, Licence, Theme) ->
+Application.Controllers.controller "ProjectElementsController", ["$scope", "$state", 'Component', 'Licence', 'Theme', 'componentsPromise', 'licencesPromise', 'themesPromise'
+, ($scope, $state, Component, Licence, Theme, componentsPromise, licencesPromise, themesPromise) ->
## Materials list (plastic, wood ...)
- $scope.components = Component.query()
+ $scope.components = componentsPromise
## Licences list (Creative Common ...)
- $scope.licences = Licence.query()
+ $scope.licences = licencesPromise
## Themes list (cooking, sport ...)
- $scope.themes = Theme.query()
-
-
+ $scope.themes = themesPromise
##
# Saves a new component / Update an existing material to the server (form validation callback)
@@ -153,5 +152,3 @@ Application.Controllers.controller "projectElementsController", ["$scope", "$sta
else
$scope.licences.splice(index, 1)
]
-
-
diff --git a/app/assets/javascripts/controllers/admin/settings.coffee b/app/assets/javascripts/controllers/admin/settings.coffee
new file mode 100644
index 000000000..ff84c7170
--- /dev/null
+++ b/app/assets/javascripts/controllers/admin/settings.coffee
@@ -0,0 +1,196 @@
+'use strict'
+
+Application.Controllers.controller "SettingsController", ["$scope", 'Setting', 'growl', 'settingsPromise', 'cgvFile', 'cguFile', 'logoFile', 'logoBlackFile', 'faviconFile', 'CSRF', '_t'
+ ($scope, Setting, growl, settingsPromise, cgvFile, cguFile, logoFile, logoBlackFile, faviconFile, CSRF, _t) ->
+
+
+
+ ### PUBLIC SCOPE ###
+
+ ## timepickers steps configuration
+ $scope.timepicker =
+ hstep: 1
+ mstep: 15
+
+ ## API URL where the upload forms will be posted
+ $scope.actionUrl =
+ cgu: "/api/custom_assets"
+ cgv: "/api/custom_assets"
+ logo: "/api/custom_assets"
+ logoBlack: "/api/custom_assets"
+ favicon: "/api/custom_assets"
+
+ ## Form actions on the above URL
+ $scope.methods =
+ cgu: "post"
+ cgv: "post"
+ logo: "post"
+ logoBlack: "post"
+ favicon: "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.eventReducedAmountAlert = { name: 'event_reduced_amount_alert', value: settingsPromise.event_reduced_amount_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.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.enableMove =
+ name: 'booking_move_enable'
+ value: (settingsPromise.booking_move_enable == "true")
+
+ $scope.moveDelay =
+ name: 'booking_move_delay'
+ value: parseInt(settingsPromise.booking_move_delay)
+
+ $scope.enableCancel =
+ name: 'booking_cancel_enable'
+ value: (settingsPromise.booking_cancel_enable == "true")
+
+ $scope.cancelDelay =
+ name: 'booking_cancel_delay'
+ value: parseInt(settingsPromise.booking_cancel_delay)
+
+
+
+ ##
+ # For use with 'ng-class', returns the CSS class name for the uploads previews.
+ # The preview may show a placeholder or the content of the file depending on the upload state.
+ # @param v {*} any attribute, will be tested for truthiness (see JS evaluation rules)
+ ##
+ $scope.fileinputClass = (v)->
+ if v
+ 'fileinput-exists'
+ else
+ 'fileinput-new'
+
+
+
+ ##
+ # Callback to save the setting value to the database
+ # @param setting {{value:*, name:string}} note that the value will be stringified
+ ##
+ $scope.save = (setting)->
+ # trim empty html
+ if setting.value == "
"
+ setting.value = ""
+ # convert dates to ISO format
+ if setting.value instanceof Date
+ setting.value = setting.value.toISOString()
+
+ if setting.value isnt null
+ value = setting.value.toString()
+ else
+ value = setting.value
+
+ Setting.update { name: setting.name }, { value: value }, (data)->
+ growl.success(_t('customization_of_SETTING_successfully_saved', {SETTING:setting.name}))
+ , (error)->
+ console.log(error)
+
+
+
+ ##
+ # For use with ngUpload (https://github.com/twilson63/ngUpload).
+ # Intended to be the callback when the upload is done: Any raised error will be displayed in a growl
+ # message. If everything goes fine, a growl success message is shown.
+ # @param content {Object} JSON - The upload's result
+ ##
+ $scope.submited = (content) ->
+ if !content.custom_asset?
+ $scope.alerts = []
+ angular.forEach content, (v, k)->
+ angular.forEach v, (err)->
+ growl.error(err)
+ else
+ growl.success(_t('file_successfully_updated'))
+ if content.custom_asset.name is 'cgu-file'
+ $scope.cguFile = content.custom_asset
+ $scope.methods.cgu = 'put'
+ $scope.actionUrl.cgu += '/cgu-file' unless $scope.actionUrl.cgu.indexOf('/cgu-file') > 0
+ $scope.loader.cgu = false
+ else if content.custom_asset.name is 'cgv-file'
+ $scope.cgvFile = content.custom_asset
+ $scope.methods.cgv = 'put'
+ $scope.actionUrl.cgv += '/cgv-file' unless $scope.actionUrl.cgv.indexOf('/cgv-file') > 0
+ $scope.loader.cgv = false
+ else if content.custom_asset.name is 'logo-file'
+ $scope.logoFile = content.custom_asset
+ $scope.methods.logo = 'put'
+ $scope.actionUrl.logo += '/logo-file' unless $scope.actionUrl.logo.indexOf('/logo-file') > 0
+ else if content.custom_asset.name is 'logo-black-file'
+ $scope.logoBlackFile = content.custom_asset
+ $scope.methods.logoBlack = 'put'
+ $scope.actionUrl.logoBlack += '/logo-black-file' unless $scope.actionUrl.logoBlack.indexOf('/logo-black-file') > 0
+ else if content.custom_asset.name is 'favicon-file'
+ $scope.faviconFile = content.custom_asset
+ $scope.methods.favicon = 'put'
+ $scope.actionUrl.favicon += '/favicon-file' unless $scope.actionUrl.favicon.indexOf('/favicon-file') > 0
+
+
+
+ ##
+ # @param target {String} 'cgu' | 'cgv'
+ ##
+ $scope.addLoader = (target) ->
+ $scope.loader[target] = true
+
+
+
+ ### PRIVATE SCOPE ###
+
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+ # set the authenticity tokens in the forms
+ CSRF.setMetaTags()
+
+ # we prevent the admin from setting the closing time before the opening time
+ $scope.$watch 'windowEnd.value', (newValue, oldValue, scope) ->
+ if $scope.windowStart and moment($scope.windowStart.value).isAfter(newValue)
+ $scope.windowEnd.value = oldValue
+
+ # change form methods to PUT if items already exists
+ if cguFile.custom_asset
+ $scope.methods.cgu = 'put'
+ $scope.actionUrl.cgu += '/cgu-file'
+ if cgvFile.custom_asset
+ $scope.methods.cgv = 'put'
+ $scope.actionUrl.cgv += '/cgv-file'
+ if logoFile.custom_asset
+ $scope.methods.logo = 'put'
+ $scope.actionUrl.logo += '/logo-file'
+ if logoBlackFile.custom_asset
+ $scope.methods.logoBlack = 'put'
+ $scope.actionUrl.logoBlack += '/logo-black-file'
+ if faviconFile.custom_asset
+ $scope.methods.favicon = 'put'
+ $scope.actionUrl.favicon += '/favicon-file'
+
+
+ # init the controller (call at the end !)
+ initialize()
+
+]
diff --git a/app/assets/javascripts/controllers/admin/statistics.coffee b/app/assets/javascripts/controllers/admin/statistics.coffee
new file mode 100644
index 000000000..db22fc55e
--- /dev/null
+++ b/app/assets/javascripts/controllers/admin/statistics.coffee
@@ -0,0 +1,453 @@
+'use strict'
+
+Application.Controllers.controller "StatisticsController", ["$scope", "$state", "$rootScope", "$locale", "Statistics", "es", "Member", '_t'
+, ($scope, $state, $rootScope, $locale, Statistics, es, Member, _t) ->
+
+
+
+ ### PUBLIC SCOPE ###
+
+ ## ui-view transitions optimization: if true, the stats will never be refreshed
+ $scope.preventRefresh = false
+
+ ## statistics structure in elasticSearch
+ $scope.statistics = []
+
+ ## fablab users list
+ $scope.members = []
+
+ ## statistics data recovered from elasticSearch
+ $scope.data = null
+
+ ## configuration of the widget allowing to pick the ages range
+ $scope.agePicker =
+ show: false
+ start: null
+ end: null
+
+ ## total CA for the current view
+ $scope.sumCA = 0
+
+ ## average users' age for the current view
+ $scope.averageAge = 0
+
+ ## total of the stat field for non simple types
+ $scope.sumStat = 0
+
+ ## default: results are not sorted
+ $scope.sorting =
+ ca: 'none'
+
+ ## active tab will be set here
+ $scope.selectedIndex = null
+
+ ## type filter binding
+ $scope.type =
+ selected: null
+ active: null
+
+ ## selected custom filter
+ $scope.customFilter =
+ show: false
+ criterion: {}
+ value : null
+ exclude: false
+ datePicker:
+ format: $locale.DATETIME_FORMATS.shortDate
+ opened: false # default: datePicker is not shown
+ minDate: null
+ maxDate: moment().toDate()
+ options:
+ startingDay: 1 # France: the week starts on monday
+
+ ## available custom filters
+ $scope.filters = []
+
+ ## default: we do not open the datepicker menu
+ $scope.datePicker =
+ show: false
+
+ ## datePicker parameters for interval beginning
+ $scope.datePickerStart =
+ format: $locale.DATETIME_FORMATS.shortDate
+ opened: false # default: datePicker is not shown
+ minDate: null
+ maxDate: moment().subtract(1, 'day').toDate()
+ selected: moment().utc().subtract(1, 'months').subtract(1, 'day').startOf('day').toDate()
+ options:
+ startingDay: Fablab.weekStartingDay
+
+ ## datePicker parameters for interval ending
+ $scope.datePickerEnd =
+ format: $locale.DATETIME_FORMATS.shortDate
+ opened: false # default: datePicker is not shown
+ minDate: null
+ maxDate: moment().subtract(1, 'day').toDate()
+ selected: moment().subtract(1, 'day').endOf('day').toDate()
+ options:
+ startingDay: Fablab.weekStartingDay
+
+
+
+ ##
+ # Callback to open the datepicker (interval start)
+ # @param $event {Object} jQuery event object
+ ##
+ $scope.toggleStartDatePicker = ($event) ->
+ toggleDatePicker($event, $scope.datePickerStart)
+
+
+
+ ##
+ # Callback to open the datepicker (interval end)
+ # @param $event {Object} jQuery event object
+ ##
+ $scope.toggleEndDatePicker = ($event) ->
+ toggleDatePicker($event, $scope.datePickerEnd)
+
+
+
+ ##
+ # Callback to open the datepicker (custom filter)
+ # @param $event {Object} jQuery event object
+ ##
+ $scope.toggleCustomDatePicker = ($event) ->
+ toggleDatePicker($event, $scope.customFilter.datePicker)
+
+
+
+ ##
+ # Callback called when the active tab is changed.
+ # recover the current tab and store its value in $scope.selectedIndex
+ # @param tab {Object} elasticsearch statistic structure
+ ##
+ $scope.setActiveTab = (tab) ->
+ $scope.selectedIndex = tab
+ $scope.type.selected = tab.types[0]
+ $scope.type.active = $scope.type.selected
+ $scope.customFilter.criterion = {}
+ $scope.customFilter.value = null
+ $scope.customFilter.exclude = false
+ $scope.sorting.ca = 'none'
+ buildCustomFiltersList()
+ refreshStats()
+
+
+
+ ##
+ # Callback to validate the filters and send a new request to elastic
+ ##
+ $scope.validateFilterChange = ->
+ $scope.agePicker.show = false
+ $scope.customFilter.show = false
+ $scope.type.active = $scope.type.selected
+ buildCustomFiltersList()
+ refreshStats()
+
+
+
+ ##
+ # Callback to validate the dates range and refresh the data from elastic
+ ##
+ $scope.validateDateChange = ->
+ $scope.datePicker.show = false
+ refreshStats()
+
+
+
+ ##
+ # Parse the given date and return a user-friendly string
+ # @param date {Date} JS date or ant moment.js compatible date string
+ ##
+ $scope.formatDate = (date) ->
+ moment(date).format("LL")
+
+
+
+ ##
+ # Parse the sex and return a user-friendly string
+ # @param sex {string} 'male' | 'female'
+ ##
+ $scope.formatSex = (sex) ->
+ if sex == 'male'
+ return _t('man')
+ if sex == 'female'
+ return t('woman')
+
+
+
+ ##
+ # Retrieve the label for the given subtype in the current type
+ # @param key {string} statistic subtype key
+ ##
+ $scope.formatSubtype = (key) ->
+ label = ""
+ angular.forEach $scope.type.active.subtypes, (subtype) ->
+ if subtype.key == key
+ label = subtype.label
+ label
+
+
+
+ ##
+ # Helper usable in ng-switch to determine the input type to display for custom filter value
+ # @param filter {Object} custom filter criterion
+ ##
+ $scope.getCustomValueInputType = (filter) ->
+ if filter and filter.values
+ if typeof(filter.values[0]) == 'string'
+ return filter.values[0]
+ else if typeof(filter.values[0] == 'object')
+ return 'input_select'
+ else
+ 'input_text'
+
+
+
+ ##
+ # Change the sorting order and refresh the results to match the new order
+ # @param filter {Object} any filter
+ ##
+ $scope.toggleSorting = (filter) ->
+ switch $scope.sorting[filter]
+ when 'none' then $scope.sorting[filter] = 'asc'
+ when 'asc' then $scope.sorting[filter] = 'desc'
+ when 'desc' then $scope.sorting[filter] = 'none'
+ refreshStats()
+
+
+
+ ##
+ # Return the user's name from his given ID
+ # @param id {number} user ID
+ ##
+ $scope.getUserNameFromId = (id) ->
+ if $scope.members.length == 0
+ return "ID "+id
+ else
+ for member in $scope.members
+ if member.id == id
+ return member.name
+ return "ID "+id
+
+
+
+ ### PRIVATE SCOPE ###
+
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+ Statistics.query (stats) ->
+ $scope.statistics = stats
+
+ Member.query (members) ->
+ $scope.members = members
+
+ # workaround for angular-bootstrap::tabs behavior: on tab deletion, another tab will be selected
+ # which will cause every tabs to reload, one by one, when the view is closed
+ $rootScope.$on '$stateChangeStart', (event, toState, toParams, fromState, fromParams) ->
+ if fromState.name == 'app.admin.statistics' and Object.keys(fromParams).length == 0
+ $scope.preventRefresh = true
+
+
+
+ ##
+ # Generic function to toggle a bootstrap datePicker
+ # @param $event {Object} jQuery event object
+ # @param datePicker {Object} settings object of the concerned datepicker. Must have an 'opened' property
+ ##
+ toggleDatePicker = ($event, datePicker) ->
+ $event.preventDefault()
+ $event.stopPropagation()
+ datePicker.opened = !datePicker.opened
+
+
+
+ ##
+ # Force update the statistics table, querying elasticSearch according to the current config values
+ ##
+ refreshStats = ->
+ if $scope.selectedIndex and !$scope.preventRefresh
+ $scope.data = []
+ $scope.sumCA = 0
+ $scope.averageAge = 0
+ $scope.sumStat = 0
+ custom = null
+ if $scope.customFilter.criterion and $scope.customFilter.criterion.key and $scope.customFilter.value
+ custom = {}
+ custom.key = $scope.customFilter.criterion.key
+ custom.value = $scope.customFilter.value
+ custom.exclude = $scope.customFilter.exclude
+ queryElasticStats $scope.selectedIndex.es_type_key, $scope.type.active.key, custom, (res, err)->
+ if (err)
+ console.error("[statisticsController::refreshStats] Unable to refresh due to "+err)
+ else
+ $scope.data = res.hits
+ sumCA = 0
+ sumAge = 0
+ sumStat = 0
+ if $scope.data.length > 0
+ angular.forEach $scope.data, (datum) ->
+ if datum._source.ca
+ sumCA += parseInt(datum._source.ca)
+ if datum._source.age
+ sumAge += parseInt(datum._source.age)
+ if datum._source.stat
+ sumStat += parseInt(datum._source.stat)
+ sumAge /= $scope.data.length
+ $scope.sumCA = sumCA
+ $scope.averageAge = Math.round(sumAge*100)/100
+ $scope.sumStat = sumStat
+
+
+
+ ##
+ # Run the elasticSearch query to retreive the /stats/type aggregations
+ # @param index {String} elasticSearch document type (account|event|machine|project|subscription|training)
+ # @param type {String} statistics type (month|year|booking|hour|user|project)
+ # @param custom {{key:{string}, value:{string}}|null} custom filter property or null to disable this filter
+ # @param callback {function} function be to run after results were retrieved, it will receive
+ # two parameters : results {Array}, error {String} (if any)
+ ##
+ queryElasticStats = (index, type, custom, callback) ->
+ # handle invalid callback
+ if typeof(callback) != "function"
+ console.error('[statisticsController::queryElasticStats] Error: invalid callback provided')
+ return
+
+ # run query
+ es.search
+ "index": "stats"
+ "type": index
+ "size": 1000000000
+ "body": buildElasticDataQuery(type, custom, $scope.agePicker.start, $scope.agePicker.end, moment($scope.datePickerStart.selected), moment($scope.datePickerEnd.selected), $scope.sorting)
+ , (error, response) ->
+ if (error)
+ callback([], "Error: something unexpected occurred during elasticSearch query: "+error)
+ else
+ callback(response.hits)
+
+
+
+ ##
+ # Build an object representing the content of the REST-JSON query to elasticSearch,
+ # based on the provided parameters for row data recovering.
+ # @param type {String} statistics type (month|year|booking|hour|user|project)
+ # @param custom {{key:{string}, value:{string}}|null} custom filter property or null to disable this filter
+ # @param ageMin {Number|null} filter by age: range lower value OR null to do not filter
+ # @param ageMax {Number|null} filter by age: range higher value OR null to do not filter
+ # @param intervalBegin {moment} statitics interval beginning (moment.js type)
+ # @param intervalEnd {moment} statitics interval ending (moment.js type)
+ # @param sortings {Array|null} elasticSearch criteria for sorting the results
+ ##
+ buildElasticDataQuery = (type, custom, ageMin, ageMax, intervalBegin, intervalEnd, sortings) ->
+ q =
+ "query":
+ "bool":
+ "must": [
+ {
+ "term":
+ "type": type
+ }
+ {
+ "range":
+ "date":
+ "gte": intervalBegin.format()
+ "lte": intervalEnd.format()
+ }
+ ]
+ # optional date range
+ if ageMin && ageMax
+ q.query.bool.must.push
+ "range":
+ "age":
+ "gte": ageMin
+ "lte": ageMax
+ # optional criterion
+ if custom
+ criterion = {
+ "match" : {}
+ }
+ switch $scope.getCustomValueInputType($scope.customFilter.criterion)
+ when 'input_date' then criterion.match[custom.key] = moment(custom.value).format('YYYY-MM-DD')
+ when 'input_select' then criterion.match[custom.key] = custom.value.key
+ when 'input_list' then criterion.match[custom.key+".name"] = custom.value
+ else criterion.match[custom.key] = custom.value
+
+ if (custom.exclude)
+ q = "query": {
+ "filtered": {
+ "query": q.query,
+ "filter": {
+ "not": {
+ "term": criterion.match
+ }
+ }
+ }
+ }
+ else
+ q.query.bool.must.push(criterion)
+
+
+ if sortings
+ q["sort"] = buildElasticSortCriteria(sortings)
+ q
+
+
+
+ ##
+ # Parse the provided criteria array and return the corresponding elasticSearch syntax
+ # @param criteria {Array} array of {key_to_sort:order}
+ ##
+ buildElasticSortCriteria = (criteria) ->
+ crits = []
+ angular.forEach criteria, (value, key) ->
+ if typeof value != 'undefined' and value != null and value != 'none'
+ c = {}
+ c[key] = {'order': value}
+ crits.push(c)
+ crits
+
+
+
+ ##
+ # Fullfil the list of available options in the custom filter panel. The list will be based on common
+ # properties and on index-specific properties (additional_fields)
+ ##
+ buildCustomFiltersList = ->
+ $scope.filters = []
+
+ filters = [
+ {key: 'date', label: _t('date'), values: ['input_date']},
+ {key: 'userId', label: _t('user_id'), values: ['input_number']},
+ {key: 'gender', label: _t('gender'), values: [{key:'male', label:_t('man')}, {key:'female', label:_t('woman')}]},
+ {key: 'age', label: _t('age'), values: ['input_number']},
+ {key: 'subType', label: _t('type'), values: $scope.type.active.subtypes},
+ {key: 'ca', label: _t('revenue'), values: ['input_number']}
+ ]
+
+ $scope.filters = filters
+
+ if !$scope.type.active.simple
+ f = {key: 'stat', label: $scope.type.active.label, values: ['input_number']}
+ $scope.filters.push(f)
+
+ angular.forEach $scope.selectedIndex.additional_fields, (field) ->
+ filter = {key: field.key, label: field.label, values:[]}
+ switch field.data_type
+ when 'index' then filter.values.push('input_number')
+ when 'number' then filter.values.push('input_number')
+ when 'date' then filter.values.push('input_date')
+ when 'list' then filter.values.push('input_list')
+ else filter.values.push('input_text')
+
+ $scope.filters.push(filter)
+
+
+
+
+ # init the controller (call at the end !)
+ initialize()
+
+]
diff --git a/app/assets/javascripts/controllers/admin/tags.coffee.erb b/app/assets/javascripts/controllers/admin/tags.coffee.erb
new file mode 100644
index 000000000..5402a7871
--- /dev/null
+++ b/app/assets/javascripts/controllers/admin/tags.coffee.erb
@@ -0,0 +1,65 @@
+Application.Controllers.controller "TagsController", ["$scope", 'tagsPromise', 'Tag', 'growl', '_t', ($scope, tagsPromise, Tag, growl, _t) ->
+
+ ## List of users's tags
+ $scope.tags = tagsPromise
+
+
+
+ ##
+ # Removes the newly inserted but not saved tag / Cancel the current tag modification
+ # @param rowform {Object} see http://vitalets.github.io/angular-xeditable/
+ # @param index {number} tag index in the $scope.tags array
+ ##
+ $scope.cancelTag = (rowform, index) ->
+ if $scope.tags[index].id?
+ rowform.$cancel()
+ else
+ $scope.tags.splice(index, 1)
+
+
+
+ ##
+ # Creates a new empty entry in the $scope.tags array
+ ##
+ $scope.addTag = ->
+ $scope.inserted =
+ name: ''
+ $scope.tags.push($scope.inserted)
+
+
+
+ ##
+ # Saves a new tag / Update an existing tag to the server (form validation callback)
+ # @param data {Object} tag name
+ # @param [data] {number} tag id, in case of update
+ ##
+ $scope.saveTag = (data, id) ->
+ if id?
+ Tag.update {id: id}, { tag: data }, (response) ->
+ growl.success(_t('changes_successfully_saved'))
+ , (error) ->
+ growl.error(_t('an_error_occurred_while_saving_changes'))
+ else
+ Tag.save { tag: data }, (resp)->
+ growl.success(_t('new_tag_successfully_saved'))
+ $scope.tags[$scope.tags.length-1].id = resp.id
+ , (error) ->
+ growl.error(_t('an_error_occurred_while_saving_the_new_tag'))
+ $scope.tags.splice($scope.tags.length-1, 1)
+
+
+
+ ##
+ # Deletes the tag at the specified index
+ # @param index {number} tag index in the $scope.tags array
+ ##
+ $scope.removeTag = (index) ->
+ # TODO add confirmation : les utilisateurs seront déasociés
+ Tag.delete { id: $scope.tags[index].id }, (resp) ->
+ growl.success(_t('tag_successfully_deleted'))
+ $scope.tags.splice(index, 1)
+ , (error) ->
+ growl.error(_t('an_error_occurred_and_the_tag_deletion_failed'))
+
+
+]
diff --git a/app/assets/javascripts/controllers/admin/trainings.coffee.erb b/app/assets/javascripts/controllers/admin/trainings.coffee.erb
new file mode 100644
index 000000000..44051492f
--- /dev/null
+++ b/app/assets/javascripts/controllers/admin/trainings.coffee.erb
@@ -0,0 +1,230 @@
+'use strict'
+
+Application.Controllers.controller "TrainingsController", ["$scope", "$state", "$uibModal", 'Training', 'trainingsPromise', 'machinesPromise', '_t', 'growl'
+, ($scope, $state, $uibModal, Training, trainingsPromise, machinesPromise, _t, growl) ->
+
+
+
+ ### PUBLIC SCOPE ###
+
+ ## list of trainings
+ $scope.trainings = trainingsPromise
+
+ ## simplified list of machines
+ $scope.machines = machinesPromise
+
+ ## list of training availabilies, grouped by date
+ $scope.groupedAvailabilities = {}
+
+ ## default: accordions are not open
+ $scope.accordions = {}
+
+ ## Binding for the parseInt function
+ $scope.parseInt = parseInt
+
+ ##
+ # In the trainings listing tab, return the stringified list of machines associated with the provided training
+ # @param training {Object} Training object, inherited from $resource
+ # @returns {string}
+ ##
+ $scope.showMachines = (training) ->
+ selected = []
+ angular.forEach $scope.machines, (m) ->
+ if (training.machine_ids.indexOf(m.id) >= 0)
+ selected.push(m.name)
+ return if selected.length then selected.join(', ') else _t('none')
+
+
+
+ ##
+ # Create a new empty training object and append it to the $scope.trainings list
+ ##
+ $scope.addTraining = ->
+ $scope.inserted =
+ name: ''
+ machine_ids: []
+ $scope.trainings.push($scope.inserted)
+
+
+
+ ##
+ # Saves a new training / Update an existing training to the server (form validation callback)
+ # @param data {Object} training name, associated machine(s) and default places number
+ # @param id {number} training id, in case of update
+ ##
+ $scope.saveTraining = (data, id) ->
+ if id?
+ Training.update {id: id},
+ training: data
+ else
+ Training.save
+ training: data
+ , (resp) ->
+ $scope.trainings[$scope.trainings.length-1] = resp
+ console.log(resp)
+
+
+
+ ##
+ # Removes the newly inserted but not saved training / Cancel the current training modification
+ # @param rowform {Object} see http://vitalets.github.io/angular-xeditable/
+ # @param index {number} training index in the $scope.trainings array
+ ##
+ $scope.cancelTraining = (rowform, index) ->
+ if $scope.trainings[index].id?
+ rowform.$cancel()
+ else
+ $scope.trainings.splice(index, 1)
+
+
+
+ ##
+ # In the trainings monitoring tab, callback to open a modal window displaying the current bookings for the
+ # provided training slot. The admin will be then able to validate the training for the users that followed
+ # the training.
+ # @param training {Object} Training object, inherited from $resource
+ # @param availability {Object} time slot when the training occurs
+ ##
+ $scope.showReservations = (training, availability) ->
+ $uibModal.open
+ templateUrl: '<%= asset_path "admin/trainings/validTrainingModal.html" %>'
+ controller: ['$scope', '$uibModalInstance', ($scope, $uibModalInstance) ->
+ $scope.availability = availability
+
+ $scope.usersToValid = []
+
+ ##
+ # Mark/unmark the provided user for training validation
+ # @param user {Object} from the availability.reservation_users list
+ ##
+ $scope.toggleSelection = (user) ->
+ index = $scope.usersToValid.indexOf(user)
+ if index > -1
+ $scope.usersToValid.splice(index, 1)
+ else
+ $scope.usersToValid.push user
+
+ ##
+ # Validates the modifications (training validations) and save them to the server
+ ##
+ $scope.ok = ->
+ users = $scope.usersToValid.map (u) ->
+ u.id
+ Training.update {id: training.id},
+ training:
+ users: users
+ , -> # success
+ angular.forEach $scope.usersToValid, (u) ->
+ u.is_valid = true
+ $scope.usersToValid = []
+ $uibModalInstance.close(training)
+
+ ##
+ # Cancel the modifications and close the modal window
+ ##
+ $scope.cancel = ->
+ $uibModalInstance.dismiss('cancel')
+ ]
+
+
+
+ ##
+ # Delete the provided training and, in case of sucess, remove it from the trainings list afterwards
+ # @param index {number} index of the provided training in $scope.trainings
+ # @param training {Object} training to delete
+ ##
+ $scope.removeTraining = (index, training)->
+ training.$delete ->
+ $scope.trainings.splice(index, 1)
+ growl.info(_t('training_successfully_deleted'))
+ , (error)->
+ growl.warning(_t('unable_to_delete_the_training_because_some_users_alredy_booked_it'))
+
+
+
+ ##
+ # Open the modal to edit description of the training
+ # @param training {Object} Training to edit description
+ ##
+ $scope.openModalToSetDescription = (training)->
+ $uibModal.open(
+ templateUrl: "<%= asset_path 'admin/trainings/modal_edit.html' %>"
+ controller: ['$scope', '$uibModalInstance', 'Training', 'growl', ($scope, $uibModalInstance, Training, growl)->
+ $scope.training = training
+ $scope.save = ->
+ Training.update id: training.id, { training: { description: $scope.training.description } }, (training)->
+ $uibModalInstance.close()
+ growl.success(_t('description_was_successfully_saved'))
+ return
+ ]
+ )
+
+
+
+ ##
+ # Takes a month number and return its localized literal name
+ # @param {Number} from 0 to 11
+ # @returns {String} eg. 'janvier'
+ ##
+ $scope.formatMonth = (number) ->
+ number = parseInt(number)
+ moment().month(number).format('MMMM')
+
+
+
+ ##
+ # Given a day, month and year, return a localized literal name for the day
+ # @param day {Number} from 1 to 31
+ # @param month {Number} from 0 to 11
+ # @param year {Number} Gregorian's year number
+ # @returns {String} eg. 'mercredi 12'
+ ##
+ $scope.formatDay = (day, month, year) ->
+ day = parseInt(day)
+ month = parseInt(month)
+ year = parseInt(year)
+
+ moment({year: year, month:month, day:day}).format('dddd D')
+
+
+
+ ### PRIVATE SCOPE ###
+
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+ $scope.groupedAvailabilities = groupAvailabilities($scope.trainings)
+
+
+
+ ##
+ # Group the trainings availabilites by trainings and by dates and return the resulting tree
+ # @param trainings {Array} $scope.trainings is expected here
+ # @returns {Object} Tree constructed as /training_name/year/month/day/[availabilities]
+ ##
+ groupAvailabilities = (trainings) ->
+ tree = {}
+ for training in trainings
+ tree[training.name] = {}
+ tree[training.name].training = training
+ for availability in training.availabilities
+ start = moment(availability.start_at)
+
+ # init the tree structure
+ if typeof tree[training.name][start.year()] == 'undefined'
+ tree[training.name][start.year()] = {}
+ if typeof tree[training.name][start.year()][start.month()] == 'undefined'
+ tree[training.name][start.year()][start.month()] = {}
+ if typeof tree[training.name][start.year()][start.month()][start.date()] == 'undefined'
+ tree[training.name][start.year()][start.month()][start.date()] = []
+
+ # add the availability at its right place
+ tree[training.name][start.year()][start.month()][start.date()].push( availability )
+ tree
+
+
+
+ # init the controller (call at the end !)
+ initialize()
+]
diff --git a/app/assets/javascripts/controllers/application.coffee.erb b/app/assets/javascripts/controllers/application.coffee.erb
index 49cefa6db..604310e0c 100644
--- a/app/assets/javascripts/controllers/application.coffee.erb
+++ b/app/assets/javascripts/controllers/application.coffee.erb
@@ -1,6 +1,7 @@
'use strict'
-Application.Controllers.controller 'ApplicationController', ["$rootScope", "$scope", "Session", "AuthService", "Auth", "$modal", "$state", 'growl', 'Notification', '$interval', ($rootScope, $scope, Session, AuthService, Auth, $modal, $state, growl, Notification, $interval) ->
+Application.Controllers.controller 'ApplicationController', ["$rootScope", "$scope", "$window", "Session", "AuthService", "Auth", "$uibModal", "$state", 'growl', 'Notification', '$interval', "Setting", '$locale', '_t'
+, ($rootScope, $scope, $window, Session, AuthService, Auth, $uibModal, $state, growl, Notification, $interval, Setting, $locale, _t) ->
@@ -18,14 +19,14 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
# @param user {Object} Rails/Devise user
##
$scope.setCurrentUser = (user) ->
- $scope.currentUser = user
+ $rootScope.currentUser = user
Session.create(user);
getNotifications()
##
# Login callback
- # @param e {Object} jQuery event
+ # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
# @param callback {function}
##
$scope.login = (e, callback) ->
@@ -36,14 +37,14 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
##
# Logout callback
- # @param e {Object} jQuery event
+ # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
##
$scope.logout = (e) ->
e.preventDefault()
Auth.logout().then (oldUser) ->
# console.log(oldUser.name + " you're signed out now.");
Session.destroy()
- $scope.currentUser = null
+ $rootScope.currentUser = null
$rootScope.toCheckNotifications = false
$scope.notifications = []
$state.go('app.public.home')
@@ -54,21 +55,21 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
##
# Open the modal window allowing the user to create an account.
- # @param e {Object} jQuery event
+ # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
##
$scope.signup = (e) ->
e.preventDefault() if e
- $modal.open
+ $uibModal.open
templateUrl: '<%= asset_path "shared/signupModal.html" %>'
size: 'md'
- controller: ['$scope', '$modalInstance', 'Group', ($scope, $modalInstance, Group) ->
+ controller: ['$scope', '$uibModalInstance', 'Group', 'CustomAsset', ($scope, $uibModalInstance, Group, CustomAsset) ->
# default parameters for the date picker in the account creation modal
$scope.datePicker =
- format: 'dd/MM/yyyy'
+ format: $locale.DATETIME_FORMATS.shortDate
opened: false
options:
- startingDay: 1
+ startingDay: Fablab.weekStartingDay
# callback to open the date picker (account creation modal)
$scope.openDatePicker = ($event) ->
@@ -80,6 +81,10 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
Group.query (groups) ->
$scope.groups = groups
+ # retrieve the CGU
+ CustomAsset.get {name: 'cgu-file'}, (cgu) ->
+ $scope.cgu = cgu.custom_asset
+
# default user's parameters
$scope.user =
is_allow_contact: true
@@ -95,7 +100,7 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
$scope.alerts = []
Auth.register($scope.user).then (user) ->
# creation successful
- $modalInstance.close(user)
+ $uibModalInstance.close(user)
, (error) ->
# creation failed...
angular.forEach error.data.errors, (v, k) ->
@@ -114,10 +119,10 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
# @param token {string} security token for password changing. The user should have recieved it by mail
##
$scope.editPassword = (token) ->
- $modal.open
+ $uibModal.open
templateUrl: '<%= asset_path "shared/passwordEditModal.html" %>'
size: 'md'
- controller: ['$scope', '$modalInstance', '$http', ($scope, $modalInstance, $http) ->
+ controller: ['$scope', '$uibModalInstance', '$http', '_t', ($scope, $uibModalInstance, $http, _t) ->
$scope.user =
reset_password_token: token
$scope.alerts = []
@@ -127,7 +132,7 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
$scope.changePassword = ->
$scope.alerts = []
$http.put('/users/password.json', {user: $scope.user}).success (data) ->
- $modalInstance.close()
+ $uibModalInstance.close()
.error (data) ->
angular.forEach data.errors, (v, k) ->
angular.forEach v, (err) ->
@@ -136,20 +141,20 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
type: 'danger'
]
.result['finally'](null).then (user) ->
- growl.addInfoMessage('Votre mot de passe a bien été modifié.')
+ growl.success(_t('your_password_was_successfully_changed'))
Auth.login().then (user) ->
$scope.setCurrentUser(user)
, (error) ->
# Authentication failed...
-
+
##
# Compact/Expend the width of the left navigation bar
- # @param e {Object} jQuery event object
+ # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
##
$scope.toggleNavSize = (event) ->
if typeof event == 'undefined'
- console.error '[applicationController::toggleNavSize] Missing event parameter'
+ console.error '[ApplicationController::toggleNavSize] Missing event parameter'
return
toggler = $(event.target)
@@ -184,14 +189,16 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
### PRIVATE SCOPE ###
-
##
# Kind of constructor: these actions will be realized first when the controller is loaded
##
initialize = ->
+
# try to retrieve any currently logged user
Auth.login().then (user) ->
$scope.setCurrentUser(user)
+ if user.need_completion
+ $state.transitionTo('app.logged.profileCompletion')
, (error) ->
# Authentication failed...
$rootScope.toCheckNotifications = false
@@ -205,11 +212,17 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
event.preventDefault()
if AuthService.isAuthenticated()
# user is not allowed
- console.log('user is not allowed')
+ console.error('[ApplicationController::initialize] user is not allowed')
else
# user is not logged in
openLoginModal(toState, toParams)
+ Setting.get { name: 'fablab_name' }, (data)->
+ $scope.fablabName = data.setting.value
+ Setting.get { name: 'name_genre' }, (data)->
+ $scope.nameGenre = data.setting.value
+
+
# shorthands
$scope.isAuthenticated = Auth.isAuthenticated;
@@ -223,7 +236,7 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
##
getNotifications = ->
$rootScope.toCheckNotifications = true
- unless $rootScope.checkNotificationsIsInit or !$scope.currentUser
+ unless $rootScope.checkNotificationsIsInit or !$rootScope.currentUser
$scope.notifications = Notification.query {is_read: false}
$scope.$watch 'notifications', (newValue, oldValue) ->
diff = []
@@ -239,7 +252,7 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
angular.forEach diff, (notification, key) ->
- growl.addInfoMessage(notification.message.description)
+ growl.info(notification.message.description)
, true
@@ -257,35 +270,39 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
# Open the modal window allowing the user to log in.
##
openLoginModal = (toState, toParams, callback) ->
- $modal.open
+ <% active_provider = AuthProvider.active %>
+ <% if active_provider.providable_type != DatabaseProvider.name %>
+ $window.location.href = '<%=user_omniauth_authorize_path(AuthProvider.active.strategy_name.to_sym)%>'
+ <% else %>
+ $uibModal.open
templateUrl: '<%= asset_path "shared/deviseModal.html" %>'
size: 'sm'
- controller: ['$scope', '$modalInstance', ($scope, $modalInstance) ->
+ controller: ['$scope', '$uibModalInstance', '_t', ($scope, $uibModalInstance, _t) ->
user = $scope.user = {}
$scope.login = () ->
Auth.login(user).then (user) ->
# Authentification succeeded ...
- $modalInstance.close(user)
+ $uibModalInstance.close(user)
if callback and typeof callback is "function"
callback(user)
, (error) ->
# Authentication failed...
$scope.alerts = []
$scope.alerts.push
- msg: 'E-mail ou mot de passe incorrect.'
+ msg: _t('wrong_email_or_password')
type: 'danger'
# handle modal behaviors. The provided reason will be used to define the following actions
$scope.dismiss = ->
- $modalInstance.dismiss('cancel')
+ $uibModalInstance.dismiss('cancel')
$scope.openSignup = (e) ->
e.preventDefault()
- $modalInstance.dismiss('signup')
+ $uibModalInstance.dismiss('signup')
$scope.openResetPassword = (e) ->
e.preventDefault()
- $modalInstance.dismiss('resetPassword')
+ $uibModalInstance.dismiss('resetPassword')
]
# what to do when the modal is closed
@@ -303,25 +320,26 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco
$scope.signup()
else if reason is 'resetPassword'
# open the 'reset password' modal
- $modal.open
+ $uibModal.open
templateUrl: '<%= asset_path "shared/passwordNewModal.html" %>'
size: 'sm'
- controller: ['$scope', '$modalInstance', '$http', ($scope, $modalInstance, $http) ->
+ controller: ['$scope', '$uibModalInstance', '$http', ($scope, $uibModalInstance, $http) ->
$scope.user = {email: ''}
$scope.sendReset = () ->
$scope.alerts = []
$http.post('/users/password.json', {user: $scope.user}).success ->
- $modalInstance.close()
+ $uibModalInstance.close()
.error ->
$scope.alerts.push
- msg: "Votre adresse email n'existe pas."
+ msg: _t('your_email_address_is_unknown')
type: 'danger'
]
.result['finally'](null).then ->
- growl.addInfoMessage('Vous allez recevoir sous quelques minutes un e-mail vous indiquant comment réinitialiser votre mot de passe.')
+ growl.info(_t('you_will_receive_in_a_moment_an_email_with_instructions_to_reset_your_password'))
# otherwise the user just closed the modal
+ <% end %>
diff --git a/app/assets/javascripts/controllers/dashboard.coffee b/app/assets/javascripts/controllers/dashboard.coffee
index e01bde51e..2e878fa46 100644
--- a/app/assets/javascripts/controllers/dashboard.coffee
+++ b/app/assets/javascripts/controllers/dashboard.coffee
@@ -1,43 +1,7 @@
'use strict'
-##
-# Controller used on the private projects listing page (my dashboard/projects)
-##
-Application.Controllers.controller "dashboardProjectsController", ["$scope", 'Member', ($scope, Member) ->
+Application.Controllers.controller "DashboardController", ["$scope", 'memberPromise', ($scope, memberPromise) ->
-## Current user's profile
- $scope.user = Member.get {id: $scope.currentUser.id}
-]
-
-
-
-##
-# Controller used on the personal trainings page (my dashboard/trainings)
-##
-Application.Controllers.controller "dashboardTrainingsController", ["$scope", 'Member', ($scope, Member) ->
-
-## Current user's profile
- $scope.user = Member.get {id: $scope.currentUser.id}
-]
-
-
-
-##
-# Controller used on the private events page (my dashboard/events)
-##
-Application.Controllers.controller "dashboardEventsController", ["$scope", 'Member', ($scope, Member) ->
-
-## Current user's profile
- $scope.user = Member.get {id: $scope.currentUser.id}
-]
-
-
-
-##
-# Controller used on the personal invoices listing page (my dashboard/invoices)
-##
-Application.Controllers.controller "dashboardInvoicesController", ["$scope", 'Member', ($scope, Member) ->
-
-## Current user's profile
- $scope.user = Member.get {id: $scope.currentUser.id}
+ ## Current user's profile
+ $scope.user = memberPromise
]
diff --git a/app/assets/javascripts/controllers/events.coffee.erb b/app/assets/javascripts/controllers/events.coffee.erb
index 21eab3d96..0ef4e2939 100644
--- a/app/assets/javascripts/controllers/events.coffee.erb
+++ b/app/assets/javascripts/controllers/events.coffee.erb
@@ -1,71 +1,72 @@
'use strict'
-Application.Controllers.controller "eventsController", ["$scope", "$state", 'Event', ($scope, $state, Event) ->
+Application.Controllers.controller "EventsController", ["$scope", "$state", 'Event', ($scope, $state, Event) ->
- ### PRIVATE STATIC CONSTANTS ###
+ ### PRIVATE STATIC CONSTANTS ###
- # Number of events added to the page when the user clicks on 'load next events'
- EVENTS_PER_PAGE = 12
+ # Number of events added to the page when the user clicks on 'load next events'
+ EVENTS_PER_PAGE = 12
- ### PUBLIC SCOPE ###
+ ### PUBLIC SCOPE ###
- ## The events displayed on the page
- $scope.events = []
+ ## The events displayed on the page
+ $scope.events = []
- ## By default, the pagination mode is activated to limit the page size
- $scope.paginateActive = true
+ ## By default, the pagination mode is activated to limit the page size
+ $scope.paginateActive = true
- ## The currently displayed page number
- $scope.page = 1
+ ## The currently displayed page number
+ $scope.page = 1
- ##
- # Adds EVENTS_PER_PAGE events to the bottom of the page, grouped by month
- ##
- $scope.loadMoreEvents = ->
- Event.query {page: $scope.page}, (data) ->
- $scope.events = $scope.events.concat data
- if data.length > 0
- $scope.paginateActive = false if ($scope.page-2)*EVENTS_PER_PAGE+data.length >= data[0].nb_total_events
+ ##
+ # Adds EVENTS_PER_PAGE events to the bottom of the page, grouped by month
+ ##
+ $scope.loadMoreEvents = ->
+ Event.query {page: $scope.page}, (data) ->
+ $scope.events = $scope.events.concat data
+ if data.length > 0
+ $scope.paginateActive = false if ($scope.page-2)*EVENTS_PER_PAGE+data.length >= data[0].nb_total_events
- $scope.eventsGroupByMonth = _.groupBy($scope.events, (obj) ->
- _.map ['month', 'year'], (key, value) -> obj[key]
- )
- $scope.monthOrder = _.sortBy _.keys($scope.eventsGroupByMonth), (k)->
- monthYearArray = k.split(',')
- date = new Date()
- date.setMonth(monthYearArray[0])
- date.setYear(monthYearArray[1])
- return -date.getTime()
- else
- $scope.paginateActive = false
- $scope.page += 1
+ $scope.eventsGroupByMonth = _.groupBy($scope.events, (obj) ->
+ _.map ['month', 'year'], (key, value) -> obj[key]
+ )
+ $scope.monthOrder = _.sortBy _.keys($scope.eventsGroupByMonth), (k)->
+ monthYearArray = k.split(',')
+ date = new Date()
+ date.setMonth(monthYearArray[0])
+ date.setYear(monthYearArray[1])
+ return -date.getTime()
+ else
+ $scope.paginateActive = false
+ $scope.page += 1
- ##
- # Callback to redirect the user to the specified event page
- # @param event {{id:number}}
- ##
- $scope.showEvent = (event) ->
- $state.go('app.public.events_show', {id: event.id})
+ ##
+ # Callback to redirect the user to the specified event page
+ # @param event {{id:number}}
+ ##
+ $scope.showEvent = (event) ->
+ $state.go('app.public.events_show', {id: event.id})
- ### PRIVATE SCOPE ###
+ ### PRIVATE SCOPE ###
- ##
- # Kind of constructor: these actions will be realized first when the controller is loaded
- ##
- initialize = ->
- $scope.loadMoreEvents()
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+ $scope.loadMoreEvents()
- ## !!! MUST BE CALLED AT THE END of the controller
- initialize()
+
+ ## !!! MUST BE CALLED AT THE END of the controller
+ initialize()
]
@@ -74,47 +75,440 @@ Application.Controllers.controller "eventsController", ["$scope", "$state", 'Eve
-Application.Controllers.controller "showEventController", ["$scope", "$state", "$stateParams", "Event", '$modal', 'Member', ($scope, $state, $stateParams, Event, $modal, Member) ->
+Application.Controllers.controller "ShowEventController", ["$scope", "$state", "$stateParams", "Event", '$uibModal', 'Member', 'Reservation', 'Price', 'CustomAsset', 'eventPromise', 'reducedAmountAlert', 'growl', '_t'
+($scope, $state, $stateParams, Event, $uibModal, Member, Reservation, Price, CustomAsset, eventPromise, reducedAmountAlert, growl, _t) ->
- ### PUBLIC SCOPE ###
+ ### PUBLIC SCOPE ###
+ $scope.reducedAmountAlert = reducedAmountAlert.setting.value
- ## current event details
- $scope.event = {}
+ ## reservations for the currently shown event
+ $scope.reservations = []
+
+ ## user to deal with
+ $scope.ctrl =
+ member: {}
+
+ ## parameters for a new reservation
+ $scope.reserve =
+ nbPlaces: []
+ nbReducedPlaces: []
+ nbReservePlaces: 0
+ nbReserveReducedPlaces: 0
+ toReserve: false
+ amountTotal : 0
- ##
- # Callback to delete the provided event (admins only)
- # @param event {$resource} angular's Event $resource
- ##
- $scope.deleteEvent = (event) ->
- event.$delete ->
- $state.go('app.public.events_list')
+ # get the details for the current event (event's id is recovered from the current URL)
+ $scope.event = eventPromise
- ### PRIVATE SCOPE ###
-
- ##
- # Kind of constructor: these actions will be realized first when the controller is loaded
- ##
- initialize = ->
-
- # get the details for the current event (event's id is recovered from the current URL)
- Event.get {id: $stateParams.id}
- , (data) ->
- $scope.event = data
- if !$scope.event.reduced_amount
- $scope.event.reduced_amount = 0
- return
- , ->
- $state.go('app.public.events_list')
+ ##
+ # Callback to delete the provided event (admins only)
+ # @param event {$resource} angular's Event $resource
+ ##
+ $scope.deleteEvent = (event) ->
+ event.$delete ->
+ $state.go('app.public.events_list')
- ## !!! MUST BE CALLED AT THE END of the controller
- initialize()
+ ##
+ # Callback to call when the number of places change in the current booking
+ ##
+ $scope.changeNbPlaces = ->
+ reste = $scope.event.nb_free_places - $scope.reserve.nbReservePlaces
+ $scope.reserve.nbReducedPlaces = [0..reste]
+ $scope.computeEventAmount()
+
+
+
+ ##
+ # Callback to call when the number of discounted places change in the current booking
+ ##
+ $scope.changeNbReducedPlaces = ->
+ reste = $scope.event.nb_free_places - $scope.reserve.nbReserveReducedPlaces
+ $scope.reserve.nbPlaces = [0..reste]
+ $scope.computeEventAmount()
+
+
+
+ ##
+ # Callback to reset the current reservation parameters
+ # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
+ ##
+ $scope.cancelReserve = (e)->
+ e.preventDefault()
+ resetEventReserve()
+
+
+
+ ##
+ # Callback to allow the user to set the details for his reservation
+ ##
+ $scope.reserveEvent = ->
+ if $scope.event.nb_total_places > 0
+ $scope.reserveSuccess = false
+ if !$scope.isAuthenticated()
+ $scope.login null, (user)->
+ $scope.reserve.toReserve = !$scope.reserve.toReserve
+ if user.role isnt 'admin'
+ $scope.ctrl.member = user
+ else
+ Member.query (members) ->
+ $scope.members = members
+ else
+ $scope.reserve.toReserve = !$scope.reserve.toReserve
+
+
+
+ ##
+ # 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 = ->
+ resetEventReserve()
+ $scope.reserveSuccess = false
+ if $scope.ctrl.member
+ getReservations($scope.event.id, 'Event', $scope.ctrl.member.id)
+
+
+
+ ##
+ # Callback to trigger the payment process of the current reservation
+ ##
+ $scope.payEvent = ->
+
+ # first, we check that a user was selected
+ if Object.keys($scope.ctrl.member).length > 0
+ reservation = mkReservation($scope.ctrl.member, $scope.reserve, $scope.event)
+
+ if $scope.currentUser.role isnt 'admin' and $scope.reserve.amountTotal > 0
+ payByStripe(reservation)
+ else
+ if $scope.currentUser.role is 'admin' or $scope.reserve.amountTotal is 0
+ payOnSite(reservation)
+ else
+ # otherwise we alert, this error musn't occur when the current user is not admin
+ growl.error(_t('please_select_a_member_first'))
+
+
+
+ ##
+ # Callback to validate the booking of a free event
+ ##
+ $scope.validReserveEvent = ->
+ reservation =
+ user_id: $scope.ctrl.member.id
+ reservable_id: $scope.event.id
+ reservable_type: 'Event'
+ slots_attributes: []
+ nb_reserve_places: $scope.reserve.nbReservePlaces
+ nb_reserve_reduced_places: $scope.reserve.nbReserveReducedPlaces
+ reservation.slots_attributes.push
+ start_at: $scope.event.start_date
+ end_at: $scope.event.end_date
+ availability_id: $scope.event.availability.id
+ $scope.attempting = true
+ Reservation.save reservation: reservation, (reservation) ->
+ afterPayment(reservation)
+ $scope.attempting = false
+ , (response)->
+ $scope.alerts = []
+ $scope.alerts.push
+ msg: response.data.card[0]
+ type: 'danger'
+ $scope.attempting = false
+
+
+
+ ##
+ # Callback to alter an already booked reservation date. A modal window will be opened to allow the user to choose
+ # a new date for his reservation (if any available)
+ # @param reservation {{id:number, reservable_id:number, nb_reserve_places:number, nb_reserve_reduced_places:number}}
+ # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
+ ##
+ $scope.modifyReservation = (reservation, e)->
+ e.preventDefault()
+ e.stopPropagation()
+
+ index = $scope.reservations.indexOf(reservation)
+ $uibModal.open
+ templateUrl: '<%= asset_path "events/modify_event_reservation_modal.html" %>'
+ resolve:
+ event: -> $scope.event
+ reservation: -> reservation
+ controller: ['$scope', '$uibModalInstance', 'event', 'reservation', 'Reservation', ($scope, $uibModalInstance, event, reservation, Reservation) ->
+ # we copy the controller's resolved parameters into the scope
+ $scope.event = event
+ $scope.reservation = angular.copy reservation
+
+ # set the reservable_id to the first available event
+ for e in event.recurrence_events
+ if e.nb_free_places > (reservation.nb_reserve_places + reservation.nb_reserve_reduced_places)
+ $scope.reservation.reservable_id = e.id
+ break
+
+ # Callback to validate the new reservation's date
+ $scope.ok = ->
+ eventToPlace = null
+ angular.forEach event.recurrence_events, (e)->
+ if e.id is parseInt($scope.reservation.reservable_id, 10)
+ eventToPlace = e
+ $scope.reservation.slots[0].start_at = eventToPlace.start_date
+ $scope.reservation.slots[0].end_at = eventToPlace.end_date
+ $scope.reservation.slots[0].availability_id = eventToPlace.availability_id
+ $scope.reservation.slots_attributes = $scope.reservation.slots
+ $scope.attempting = true
+ Reservation.update {id: reservation.id}, {reservation: $scope.reservation}, (reservation) ->
+ $uibModalInstance.close(reservation)
+ $scope.attempting = true
+ , (response)->
+ $scope.alerts = []
+ angular.forEach response, (v, k)->
+ angular.forEach v, (err)->
+ $scope.alerts.push({msg: k+': '+err, type: 'danger'})
+ $scope.attempting = false
+
+ # Callback to cancel the modification
+ $scope.cancel = ->
+ $uibModalInstance.dismiss('cancel')
+ ]
+ .result['finally'](null).then (reservation)->
+ $scope.reservations.splice(index, 1)
+ $scope.event.nb_free_places = $scope.event.nb_free_places + reservation.nb_reserve_places + reservation.nb_reserve_reduced_places
+ angular.forEach $scope.event.recurrence_events, (e)->
+ if e.id is parseInt(reservation.reservable_id, 10)
+ e.nb_free_places = e.nb_free_places - reservation.nb_reserve_places - reservation.nb_reserve_reduced_places
+
+
+
+ ##
+ # Checks if the provided reservation is able to be modified
+ # @param reservation {{nb_reserve_places:number, nb_reserve_reduced_places:number}}
+ ##
+ $scope.reservationCanModify = (reservation)->
+ isAble = false
+ angular.forEach $scope.event.recurrence_events, (e)->
+ isAble = true if e.nb_free_places > (reservation.nb_reserve_places + reservation.nb_reserve_reduced_places)
+ isAble
+
+
+
+ ##
+ # Compute the total amount for the current reservation according to the previously set parameters
+ # and assign the result in $scope.reserve.amountTotal
+ ##
+ $scope.computeEventAmount = ->
+ # first we check that a user was selected
+ if Object.keys($scope.ctrl.member).length > 0
+ r = mkReservation($scope.ctrl.member, $scope.reserve, $scope.event)
+ Price.compute {reservation: r}, (res) ->
+ $scope.reserve.amountTotal = res.price
+ else
+ $scope.reserve.amountTotal = null
+
+
+
+ ### PRIVATE SCOPE ###
+
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+ # gather the current user or the list of users if the current user is an admin
+ if $scope.currentUser
+ if $scope.currentUser.role isnt 'admin'
+ $scope.ctrl.member = $scope.currentUser
+ else
+ Member.query (members) ->
+ $scope.members = members
+
+ # check that the event's reduced rate is initialized
+ if !$scope.event.reduced_amount
+ $scope.event.reduced_amount = 0
+
+ # initialize the "reserve" object with the event's data
+ $scope.reserve.nbPlaces = [0..$scope.event.nb_free_places]
+ $scope.reserve.nbReducedPlaces = [0..$scope.event.nb_free_places]
+
+ # if non-admin, get the current user's reservations into $scope.reservations
+ if $scope.currentUser
+ getReservations($scope.event.id, 'Event', $scope.currentUser.id)
+
+
+
+ ##
+ # Retrieve the reservations for the couple event / user
+ # @param reservable_id {number} the current event id
+ # @param reservable_type {string} 'Event'
+ # @param user_id {number} the user's id (current or managed)
+ ##
+ getReservations = (reservable_id, reservable_type, user_id)->
+ Reservation.query(reservable_id: reservable_id, reservable_type: reservable_type, user_id: user_id).$promise.then (reservations)->
+ $scope.reservations = reservations
+
+
+
+ ##
+ # Create an hash map implementing the Reservation specs
+ # @param member {Object} User as retreived from the API: current user / selected user if current is admin
+ # @param reserve {Object} Reservation parameters (places...)
+ # @param event {Object} Current event (Atelier/Stage)
+ # @return {{user_id:Number, reservable_id:Number, reservable_type:String, slots_attributes:Array, nb_reserve_places:Number, nb_reserve_reduced_places:Number}}
+ ##
+ mkReservation = (member, reserve, event) ->
+ reservation =
+ user_id: member.id
+ reservable_id: event.id
+ reservable_type: 'Event'
+ slots_attributes: []
+ nb_reserve_places: reserve.nbReservePlaces
+ nb_reserve_reduced_places: reserve.nbReserveReducedPlaces
+
+ reservation.slots_attributes.push
+ start_at: event.start_date
+ end_at: event.end_date
+ availability_id: event.availability.id
+ offered: event.offered || false
+
+ reservation
+
+
+
+ ##
+ # Set the current reservation to the default values. This implies to reservation form to be hidden.
+ ##
+ resetEventReserve = ->
+ if $scope.event
+ $scope.reserve =
+ nbPlaces: [0..$scope.event.nb_free_places]
+ nbReducedPlaces: [0..$scope.event.nb_free_places]
+ nbReservePlaces: 0
+ nbReserveReducedPlaces: 0
+ toReserve: false
+ amountTotal : 0
+ $scope.event.offered = false
+
+
+
+ ##
+ # Open a modal window which trigger the stripe payment process
+ # @param reservation {Object} to book
+ ##
+ payByStripe = (reservation) ->
+ $uibModal.open
+ templateUrl: '<%= asset_path "stripe/payment_modal.html" %>'
+ size: 'md'
+ resolve:
+ reservation: ->
+ reservation
+ price: ->
+ Price.compute({reservation: reservation}).$promise
+ cgv: ->
+ CustomAsset.get({name: 'cgv-file'}).$promise
+ objectToPay: ->
+ eventToReserve: $scope.event
+ reserve: $scope.reserve
+ member: $scope.ctrl.member
+ controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'cgv', 'Auth', 'Reservation', 'growl', ($scope, $uibModalInstance, $state, reservation, price, cgv, Auth, Reservation, growl) ->
+ # Price
+ $scope.amount = price.price
+
+ # CGV
+ $scope.cgv = cgv.custom_asset
+
+ # Reservation
+ $scope.reservation = reservation
+
+ # Callback for the stripe payment authorization
+ $scope.payment = (status, response) ->
+ if response.error
+ growl.error(response.error.message)
+ else
+ $scope.attempting = true
+ $scope.reservation.card_token = response.id
+ Reservation.save reservation: $scope.reservation, (reservation) ->
+ $uibModalInstance.close(reservation)
+ , (response)->
+ $scope.alerts = []
+ $scope.alerts.push
+ msg: response.data.card[0]
+ type: 'danger'
+ $scope.attempting = false
+ ]
+ .result['finally'](null).then (reservation)->
+ afterPayment(reservation)
+
+
+
+ ##
+ # Open a modal window which trigger the local payment process
+ # @param reservation {Object} to book
+ ##
+ payOnSite = (reservation) ->
+ $uibModal.open
+ templateUrl: '<%= asset_path "shared/valid_reservation_modal.html" %>'
+ size: 'sm'
+ resolve:
+ reservation: ->
+ reservation
+ price: ->
+ Price.compute({reservation: reservation}).$promise
+ controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'Auth', 'Reservation', ($scope, $uibModalInstance, $state, reservation, price, Auth, Reservation) ->
+ # Price
+ $scope.amount = price.price
+
+ # Reservation
+ $scope.reservation = reservation
+
+ # Button label
+ if $scope.amount > 0
+ $scope.validButtonName = _t('confirm_(payment_on_site)')
+ else
+ $scope.validButtonName = _t('confirm')
+
+ # Callback to validate the payment
+ $scope.ok = ->
+ $scope.attempting = true
+ Reservation.save reservation: $scope.reservation, (reservation) ->
+ $uibModalInstance.close(reservation)
+ $scope.attempting = true
+ , (response)->
+ $scope.alerts = []
+ angular.forEach response, (v, k)->
+ angular.forEach v, (err)->
+ $scope.alerts.push
+ msg: k+': '+err
+ type: 'danger'
+ $scope.attempting = false
+
+ # Callback to cancel the payment
+ $scope.cancel = ->
+ $uibModalInstance.dismiss('cancel')
+ ]
+ .result['finally'](null).then (reservation)->
+ afterPayment(reservation)
+
+
+
+ ##
+ # What to do after the payment was successful
+ # @param resveration {Object} booked reservation
+ ##
+ afterPayment = (reservation)->
+ $scope.event.nb_free_places = $scope.event.nb_free_places - reservation.nb_reserve_places - reservation.nb_reserve_reduced_places
+ resetEventReserve()
+ $scope.reserveSuccess = true
+ $scope.reservations.push reservation
+ if $scope.currentUser.role == 'admin'
+ $scope.ctrl.member = null
+
+
+
+ ## !!! MUST BE CALLED AT THE END of the controller
+ initialize()
]
-
diff --git a/app/assets/javascripts/controllers/home.coffee b/app/assets/javascripts/controllers/home.coffee
index 5215748e4..a3a6e2085 100644
--- a/app/assets/javascripts/controllers/home.coffee
+++ b/app/assets/javascripts/controllers/home.coffee
@@ -1,35 +1,34 @@
'use strict'
-Application.Controllers.controller "homeController", ['$scope', '$stateParams', 'Member', 'Twitter', 'Project', 'Event', ($scope, $stateParams, Member, Twitter, Project, Event) ->
-
-
-
- ### PRIVATE STATIC CONSTANTS ###
-
- # The 4 last users will be displayed on the home page
- LAST_MEMBERS_LIMIT = 4
-
- # Only the last tweet is shown
- LAST_TWEETS_LIMIT = 1
-
- # The 3 closest events are shown
- LAST_EVENTS_LIMIT = 3
-
-
+Application.Controllers.controller "HomeController", ['$scope', '$stateParams', 'Twitter', 'lastMembersPromise', 'lastProjectsPromise', 'upcomingEventsPromise', 'homeBlogpostPromise', 'twitterNamePromise', ($scope, $stateParams, Twitter, lastMembersPromise, lastProjectsPromise, upcomingEventsPromise, homeBlogpostPromise, twitterNamePromise)->
### PUBLIC SCOPE ###
## The last registered members who confirmed their addresses
- $scope.last_members = []
+ $scope.lastMembers = lastMembersPromise
## The last tweets from the Fablab official twitter account
- $scope.last_tweets = []
+ $scope.lastTweets = []
## The last projects published/documented on the plateform
- $scope.last_projects = []
+ $scope.lastProjects = lastProjectsPromise
## The closest upcoming events
- $scope.upcoming_events = []
+ $scope.upcomingEvents = upcomingEventsPromise
+
+ ## The admin blogpost
+ $scope.homeBlogpost = homeBlogpostPromise.setting.value
+
+ ## Twitter username
+ $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')
@@ -39,20 +38,15 @@ Application.Controllers.controller "homeController", ['$scope', '$stateParams',
# Kind of constructor: these actions will be realized first when the controller is loaded
##
initialize = ->
- # display the reset password dialog if the parameter was provided
+ # 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)
+
+ # 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
$scope.$parent.editPassword($stateParams.reset_password_token)
- # initialize the homepage data
- Member.lastSubscribed {limit: LAST_MEMBERS_LIMIT}, (members) ->
- $scope.last_members = members
- Twitter.query {limit: LAST_TWEETS_LIMIT}, (tweets) ->
- $scope.last_tweets = tweets
- Project.lastPublished (projects) ->
- $scope.last_projects = projects
- Event.upcoming {limit: LAST_EVENTS_LIMIT}, (events) ->
- $scope.upcoming_events = events
-
## !!! MUST BE CALLED AT THE END of the controller
diff --git a/app/assets/javascripts/controllers/machines.coffee.erb b/app/assets/javascripts/controllers/machines.coffee.erb
index f5bfa0ec1..de4587a94 100644
--- a/app/assets/javascripts/controllers/machines.coffee.erb
+++ b/app/assets/javascripts/controllers/machines.coffee.erb
@@ -74,19 +74,96 @@ class MachinesController
+##
+# Manages the transition when a user clicks on the reservation button.
+# According to the status of user currently logged into the system, redirect him to the reservation page,
+# or display a modal window asking him to complete a training before he can book a machine reservation.
+# @param machine {{id:number}} An object containg the id of the machine to book,
+# the object will be completed before the fonction returns.
+# @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
+##
+_reserveMachine = (machine, e) ->
+ _this = this
+ e.preventDefault()
+ e.stopPropagation()
+
+ # retrieve the full machine object
+ machine = _this.Machine.get {id: machine.id}, ->
+
+ # if the currently logged'in user has completed the training for this machine, or this machine does not require
+ # a prior training, just redirect him to the machine's booking page
+ if machine.current_user_is_training or machine.trainings.length == 0
+ _this.$state.go('app.logged.machines_reserve', {id: machine.id})
+ else
+ # otherwise, if a user is authenticated ...
+ if _this.$scope.isAuthenticated()
+ # ... and have booked a training for this machine, tell him that he must wait for an admin to validate
+ # the training before he can book the reservation
+ if machine.current_user_training_reservation
+ _this.$uibModal.open
+ templateUrl: '<%= asset_path "machines/training_reservation_modal.html" %>'
+ controller: ['$scope', '$uibModalInstance', '$state', ($scope, $uibModalInstance, $state) ->
+ $scope.machine = machine
+ $scope.cancel = ->
+ $uibModalInstance.dismiss('cancel')
+ ]
+ # ... but does not have booked the training, tell him to register for a training session first
+ else
+ _this.$uibModal.open
+ templateUrl: '<%= asset_path "machines/request_training_modal.html" %>'
+ controller: ['$scope', '$uibModalInstance', '$state', ($scope, $uibModalInstance, $state) ->
+ $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 = ->
+ text = ''
+ angular.forEach $scope.machine.trainings, (training) ->
+ if text.length > 0
+ text += _this._t('_or_the_')
+ text += training.name.substr(0,1).toLowerCase() + training.name.substr(1)
+ text
+
+ # modal is close with validation
+ $scope.ok = ->
+ $state.go('app.logged.trainings_reserve')
+ $uibModalInstance.close(machine)
+
+ # modal is closed with escaping
+ $scope.cancel = (e)->
+ e.preventDefault()
+ $uibModalInstance.dismiss('cancel')
+ ]
+ # if the user is not logged, open the login modal window
+ else
+ _this.$scope.login()
+
+
+
+
##
# Controller used in the public listing page, allowing everyone to see the list of machines
##
-Application.Controllers.controller "machinesController", ["$scope", "$state", 'Machine', '$modal', ($scope, $state, Machine, $modal) ->
+Application.Controllers.controller "MachinesController", ["$scope", "$state", '_t', 'Machine', '$uibModal', 'machinesPromise', ($scope, $state, _t, Machine, $uibModal, machinesPromise) ->
- ## Retrieve the list of machines
- $scope.machines = Machine.query()
+## Retrieve the list of machines
+ $scope.machines = machinesPromise
##
# Redirect the user to the machine details page
##
$scope.showMachine = (machine) ->
$state.go('app.public.machines_show', {id: machine.slug})
+
+ ##
+ # Callback to book a reservation for the current machine
+ ##
+ $scope.reserveMachine = _reserveMachine.bind
+ $scope: $scope
+ $state: $state
+ _t: _t
+ $uibModal: $uibModal
+ Machine: Machine
]
@@ -94,7 +171,7 @@ Application.Controllers.controller "machinesController", ["$scope", "$state", 'M
##
# Controller used in the machine creation page (admin)
##
-Application.Controllers.controller "newMachineController", ["$scope", "$state", 'CSRF', ($scope, $state, CSRF) ->
+Application.Controllers.controller "NewMachineController", ["$scope", "$state", 'CSRF',($scope, $state, CSRF) ->
CSRF.setMetaTags()
## API URL where the form will be posted
@@ -116,8 +193,11 @@ Application.Controllers.controller "newMachineController", ["$scope", "$state",
##
# Controller used in the machine edition page (admin)
##
-Application.Controllers.controller "editMachineController", ["$scope", "$state", '$stateParams', 'Machine', 'CSRF', ($scope, $state, $stateParams, Machine, CSRF) ->
- CSRF.setMetaTags()
+Application.Controllers.controller "EditMachineController", ["$scope", '$state', '$stateParams', 'machinePromise', 'CSRF', ($scope, $state, $stateParams, machinePromise, CSRF) ->
+
+
+
+ ### PUBLIC SCOPE ###
## API URL where the form will be posted
$scope.actionUrl = "/api/machines/" + $stateParams.id
@@ -126,14 +206,24 @@ Application.Controllers.controller "editMachineController", ["$scope", "$state",
$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 = Machine.get {id: $stateParams.id}
- , ->
- return
- , ->
- $state.go('app.public.machines_list')
+ $scope.machine = machinePromise
- ## Using the MachinesController
- new MachinesController($scope, $state)
+
+
+ ### PRIVATE SCOPE ###
+
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+ CSRF.setMetaTags()
+
+ ## Using the MachinesController
+ new MachinesController($scope, $state)
+
+
+ ## !!! MUST BE CALLED AT THE END of the controller
+ initialize()
]
@@ -141,14 +231,11 @@ Application.Controllers.controller "editMachineController", ["$scope", "$state",
##
# Controller used in the machine details page (public)
##
-Application.Controllers.controller "showMachineController", ['$scope', '$state', '$modal', '$stateParams', 'Machine', ($scope, $state, $modal, $stateParams, Machine) ->
+Application.Controllers.controller "ShowMachineController", ['$scope', '$state', '$uibModal', '$stateParams', '_t', 'Machine', 'growl', 'machinePromise'
+, ($scope, $state, $uibModal, $stateParams, _t, Machine, growl, machinePromise) ->
- ## Retrieve the details for the machine id in the URL, if an error occurs redirect the user to the machines list
- $scope.machine = Machine.get {id: $stateParams.id}
- , ->
- return
- , ->
- $state.go('app.public.machines_list')
+## Retrieve the details for the machine id in the URL, if an error occurs redirect the user to the machines list
+ $scope.machine = machinePromise
##
# Callback to delete the current machine (admins only)
@@ -156,9 +243,730 @@ Application.Controllers.controller "showMachineController", ['$scope', '$state',
$scope.delete = (machine) ->
# check the permissions
if $scope.currentUser.role isnt 'admin'
- console.error 'Unauthorized operation'
+ console.error _t('unauthorized_operation')
else
# delete the machine then redirect to the machines listing
machine.$delete ->
$state.go('app.public.machines_list')
+ , (error)->
+ growl.warning(_t('the_machine_cant_be_deleted_because_it_is_already_reserved_by_some_users'))
+ ##
+ # Callback to book a reservation for the current machine
+ ##
+ $scope.reserveMachine = _reserveMachine.bind
+ $scope: $scope
+ $state: $state
+ _t: _t
+ $uibModal: $uibModal
+ Machine: Machine
+]
+
+
+
+##
+# Controller used in the machine reservation page (for logged users who have completed the training and admins).
+# This controller workflow is pretty similar to the trainings reservation controller.
+##
+
+Application.Controllers.controller "ReserveMachineController", ["$scope", "$state", '$stateParams', "$uibModal", '_t', "moment", 'Machine', 'Auth', 'dialogs', '$timeout', 'Price', 'Member', 'Availability', 'Slot', 'Setting', 'CustomAsset', 'plansPromise', 'groupsPromise', 'growl', 'settingsPromise',
+($scope, $state, $stateParams, $uibModal, _t, moment, Machine, Auth, dialogs, $timeout, Price, Member, Availability, Slot, Setting, CustomAsset, plansPromise, groupsPromise, growl, settingsPromise) ->
+
+
+
+ ### PRIVATE STATIC CONSTANTS ###
+
+ # The calendar is divided in slots of 60 minutes
+ BASE_SLOT = '01:00:00'
+
+ # The calendar will be initialized positioned under 9:00 AM
+ DEFAULT_CALENDAR_POSITION = '09:00:00'
+
+ # The user is unable to modify his already booked reservation 1 day before it occurs
+ PREVENT_BOOKING_MODIFICATION_DELAY = 1
+
+ # Slot already booked by the current user
+ FREE_SLOT_BORDER_COLOR = '#e4cd78'
+
+ # Slot already booked by another user
+ UNAVAILABLE_SLOT_BORDER_COLOR = '#1d98ec'
+
+ # Slot free to be booked
+ BOOKED_SLOT_BORDER_COLOR = '#b2e774'
+
+
+
+ ### PUBLIC SCOPE ###
+
+ ## after fullCalendar loads, provides access to its methods through $scope.calendar.fullCalendar()
+ $scope.calendar = null
+
+ ## bind the machine availabilities with full-Calendar events
+ $scope.eventSources = []
+
+ ## fullCalendar event. The last selected slot that the user want to book
+ $scope.slotToPlace = null
+
+ ## fullCalendar event. An already booked slot that the user want to modify
+ $scope.slotToModify = null
+
+ ## indicates the state of the current view : calendar or plans informations
+ $scope.plansAreShown = false
+
+ ## will store the user's plan if he choosed to buy one
+ $scope.selectedPlan = null
+
+ ## array of fullCalendar events. Slots where the user want to book
+ $scope.eventsReserved = []
+
+ ## total amount of the bill to pay
+ $scope.amountTotal = 0
+
+ ## is the user allowed to change the date of his booking
+ $scope.enableBookingMove = true
+
+ ## how many hours before the reservation, the user is still allowed to change his booking
+ $scope.moveBookingDelay = 24
+
+ ## list of plans, classified by group
+ $scope.plansClassifiedByGroup = []
+ for group in groupsPromise
+ groupObj = { id: group.id, name: group.name, plans: [] }
+ for plan in plansPromise
+ groupObj.plans.push(plan) if plan.group_id == group.id
+ $scope.plansClassifiedByGroup.push(groupObj)
+
+ ## the user to deal with, ie. the current user for non-admins
+ $scope.ctrl =
+ member: {}
+
+ ## fablab users list
+ $scope.members = []
+
+ ## current machine to reserve
+ $scope.machine = {}
+
+ ## fullCalendar (v2) configuration
+ $scope.calendarConfig =
+ timezone: Fablab.timezone
+ lang: Fablab.fullcalendar_locale
+ header:
+ left: 'month agendaWeek'
+ center: 'title'
+ right: 'today prev,next'
+ firstDay: 1 # Week start on monday (France)
+ scrollTime: DEFAULT_CALENDAR_POSITION
+ slotDuration: BASE_SLOT
+ allDayDefault: false
+ minTime: '00:00:00'
+ maxTime: '24:00:00'
+ height: 'auto'
+ buttonIcons:
+ prev: 'left-single-arrow'
+ next: 'right-single-arrow'
+ timeFormat:
+ agenda:'H:mm'
+ month: 'H(:mm)'
+ axisFormat: 'H:mm'
+
+ allDaySlot: false
+ defaultView: 'agendaWeek'
+ editable: false
+ eventClick: (event, jsEvent, view) ->
+ calendarEventClickCb(event, jsEvent, view)
+ eventRender: (event, element, view) ->
+ eventRenderCb(event, element)
+
+ ## Global config: message to the end user concerning the subscriptions rules
+ $scope.subscriptionExplicationsAlert = settingsPromise.subscription_explications_alert
+
+ ## Gloabl config: message to the end user concerning the machine bookings
+ $scope.machineExplicationsAlert = settingsPromise.machine_explications_alert
+
+ ## Global config: is the user authorized to change his bookings slots?
+ $scope.enableBookingMove = (settingsPromise.booking_move_enable == "true")
+
+ ## Global config: delay in hours before a booking while changing the booking slot is forbidden
+ $scope.moveBookingDelay = parseInt(settingsPromise.booking_move_delay)
+
+ ## Global config: is the user authorized to cancel his bookings?
+ $scope.enableBookingCancel = (settingsPromise.booking_cancel_enable == "true")
+
+ ## Global config: delay in hours before a booking while the cancellation is forbidden
+ $scope.cancelBookingDelay = parseInt(settingsPromise.booking_cancel_delay)
+
+ ## Global config: calendar window in the morning
+ $scope.calendarConfig.minTime = moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss'))
+
+ ## Global config: calendar window in the evening
+ $scope.calendarConfig.maxTime = moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss'))
+
+
+
+ ##
+ # Cancel the current booking modification, removing the previously booked slot from the selection
+ # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
+ ##
+ $scope.removeSlotToModify = (e) ->
+ e.preventDefault()
+ if $scope.slotToPlace
+ $scope.slotToPlace.backgroundColor = 'white'
+ $scope.slotToPlace.title = ''
+ $scope.slotToPlace = null
+ $scope.slotToModify.title = if $scope.currentUser.role isnt 'admin' then _t('i_ve_reserved') else _t('not_available')
+ $scope.slotToModify.backgroundColor = 'white'
+ $scope.slotToModify = null
+ $scope.calendar.fullCalendar 'rerenderEvents'
+
+
+
+ ##
+ # 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 = (e)->
+ e.preventDefault()
+ $scope.slotToPlace.backgroundColor = 'white'
+ $scope.slotToPlace.title = ''
+ $scope.slotToPlace = null
+ $scope.calendar.fullCalendar 'rerenderEvents'
+
+
+
+ ##
+ # When modifying an already booked reservation, confirm the modification.
+ ##
+ $scope.modifyMachineSlot = ->
+ Slot.update {id: $scope.slotToModify.id},
+ slot:
+ start_at: $scope.slotToPlace.start
+ end_at: $scope.slotToPlace.end
+ availability_id: $scope.slotToPlace.availability_id
+ , -> # success
+ $scope.modifiedSlots =
+ newReservedSlot: $scope.slotToPlace
+ oldReservedSlot: $scope.slotToModify
+ $scope.slotToPlace.title = if $scope.currentUser.role isnt 'admin' then _t('i_ve_reserved') else _t('not_available')
+ $scope.slotToPlace.backgroundColor = 'white'
+ $scope.slotToPlace.borderColor = $scope.slotToModify.borderColor
+ $scope.slotToPlace.id = $scope.slotToModify.id
+ $scope.slotToPlace.is_reserved = true
+ $scope.slotToPlace.can_modify = true
+ $scope.slotToPlace = null
+
+ $scope.slotToModify.backgroundColor = 'white'
+ $scope.slotToModify.title = ''
+ $scope.slotToModify.borderColor = FREE_SLOT_BORDER_COLOR
+ $scope.slotToModify.id = null
+ $scope.slotToModify.is_reserved = false
+ $scope.slotToModify.can_modify = false
+ $scope.slotToModify = null
+
+ $scope.calendar.fullCalendar 'rerenderEvents'
+ , (err) -> # failure
+ growl.error(_t('unable_to_change_the_reservation'))
+ console.error(err)
+
+
+
+ ##
+ # Cancel the current booking modification, reseting the whole process
+ ##
+ $scope.cancelModifyMachineSlot = ->
+ $scope.slotToPlace.backgroundColor = 'white'
+ $scope.slotToPlace.title = ''
+ $scope.slotToPlace = null
+ $scope.slotToModify.title = if $scope.currentUser.role isnt 'admin' then _t('i_ve_reserved') else _t('not_available')
+ $scope.slotToModify.backgroundColor = 'white'
+ $scope.slotToModify = null
+
+ $scope.calendar.fullCalendar 'rerenderEvents'
+
+
+
+ ##
+ # 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 = ->
+ $scope.paidMachineSlots = null
+ $scope.plansAreShown = false
+ $scope.selectedPlan = null
+ updateCartPrice()
+
+
+
+ ##
+ # Add the provided slot to the shopping cart (state transition from free to 'about to be reserved')
+ # and increment the total amount of the cart if needed.
+ # @param machineSlot {Object} fullCalendar event object
+ ##
+ $scope.validMachineSlot = (machineSlot)->
+ machineSlot.isValid = true
+ updateCartPrice()
+
+
+
+ ##
+ # Remove the provided slot from the shopping cart (state transition from 'about to be reserved' to free)
+ # and decrement the total amount of the cart if needed.
+ # @param machineSlot {Object} fullCalendar event object
+ # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
+ ##
+ $scope.removeMachineSlot = (machineSlot, e)->
+ e.preventDefault() if e
+ machineSlot.backgroundColor = 'white'
+ machineSlot.borderColor = FREE_SLOT_BORDER_COLOR
+ machineSlot.title = ''
+ machineSlot.isValid = false
+
+ if machineSlot.machine.is_reduced_amount
+ angular.forEach $scope.ctrl.member.machine_credits, (credit)->
+ if credit.machine_id = machineSlot.machine.id
+ credit.hours_used--
+ machineSlot.machine.is_reduced_amount = false
+
+ index = $scope.eventsReserved.indexOf(machineSlot)
+ $scope.eventsReserved.splice(index, 1)
+ if $scope.eventsReserved.length == 0
+ if $scope.plansAreShown
+ $scope.selectedPlan = null
+ $scope.plansAreShown = false
+ updateCartPrice()
+ $timeout ->
+ $scope.calendar.fullCalendar 'refetchEvents'
+ $scope.calendar.fullCalendar 'rerenderEvents'
+
+
+
+ ##
+ # Checks that every selected slots were added to the shopping cart. Ie. will return false if
+ # any checked slot was not validated by the user.
+ ##
+ $scope.machineSlotsValid = ->
+ isValid = true
+ angular.forEach $scope.eventsReserved, (m)->
+ isValid = false if !m.isValid
+ isValid
+
+
+
+ ##
+ # 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 = (e)->
+ e.preventDefault()
+ $scope.plansAreShown = false
+ $scope.selectPlan($scope.selectedPlan)
+
+
+
+ ##
+ # Validates the shopping chart and redirect the user to the payment step
+ ##
+ $scope.payMachine = ->
+
+ # first, we check that a user was selected
+ if Object.keys($scope.ctrl.member).length > 0
+ reservation = mkReservation($scope.ctrl.member, $scope.eventsReserved, $scope.selectedPlan)
+
+ if $scope.currentUser.role isnt 'admin' and $scope.amountTotal > 0
+ payByStripe(reservation)
+ else
+ if $scope.currentUser.role is 'admin' or $scope.amountTotal is 0
+ payOnSite(reservation)
+ else
+ # otherwise we alert, this error musn't occur when the current user is not admin
+ growl.error(_t('please_select_a_member_first'))
+
+
+ ##
+ # Switch the user's view from the reservation agenda to the plan subscription
+ ##
+ $scope.showPlans = ->
+ $scope.plansAreShown = true
+
+
+
+ ##
+ # Add the provided plan to the current shopping cart
+ # @param plan {Object} the plan to subscribe
+ ##
+ $scope.selectPlan = (plan) ->
+ if $scope.isAuthenticated()
+ angular.forEach $scope.eventsReserved, (machineSlot)->
+ angular.forEach $scope.ctrl.member.machine_credits, (credit)->
+ if credit.machine_id = machineSlot.machine.id
+ credit.hours_used = 0
+ machineSlot.machine.is_reduced_amount = false
+
+ if $scope.selectedPlan != plan
+ $scope.selectedPlan = plan
+ else
+ $scope.selectedPlan = null
+ updateCartPrice()
+ else
+ $scope.login null, ->
+ $scope.selectedPlan = plan
+ updateCartPrice()
+
+
+
+ ##
+ # Checks if $scope.slotToModify and $scope.slotToPlace have tag incompatibilities
+ # @returns {boolean} true in case of incompatibility
+ ##
+ $scope.tagMissmatch = ->
+ for tag in $scope.slotToModify.tags
+ if tag.id not in $scope.slotToPlace.tag_ids
+ return true
+ false
+
+
+
+ ### PRIVATE SCOPE ###
+
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+ Availability.machine {machineId: $stateParams.id}, (availabilities) ->
+ $scope.eventSources.push
+ events: availabilities
+ textColor: 'black'
+
+ if $scope.currentUser.role isnt 'admin'
+ $scope.ctrl.member = $scope.currentUser
+ else
+ Member.query {requested_attributes:'[subscription,credits]'}, (members) ->
+ $scope.members = members
+
+ $scope.machine = Machine.get {id: $stateParams.id}
+ , ->
+ return
+ , ->
+ $state.go('app.public.machines_list')
+
+
+
+ ##
+ # Create an hash map implementing the Reservation specs
+ # @param member {Object} User as retreived from the API: current user / selected user if current is admin
+ # @param slots {Array} Array of fullCalendar events: slots selected on the calendar
+ # @param [plan] {Object} Plan as retrived from the API: plan to buy with the current reservation
+ # @return {{user_id:Number, reservable_id:Number, reservable_type:String, slots_attributes:Array, plan_id:Number|null}}
+ ##
+ mkReservation = (member, slots, plan = null) ->
+ reservation =
+ user_id: member.id
+ reservable_id: (slots[0].machine.id if slots.length > 0)
+ reservable_type: 'Machine'
+ slots_attributes: []
+ plan_id: (plan.id if plan)
+ angular.forEach slots, (slot, key) ->
+ reservation.slots_attributes.push
+ start_at: slot.start
+ end_at: slot.end
+ availability_id: slot.availability_id
+ offered: slot.offered || false
+
+ reservation
+
+
+
+ ##
+ # Update the total price of the current selection/reservation
+ ##
+ updateCartPrice = ->
+ if Object.keys($scope.ctrl.member).length > 0
+ r = mkReservation($scope.ctrl.member, $scope.eventsReserved, $scope.selectedPlan)
+ Price.compute {reservation: r}, (res) ->
+ $scope.amountTotal = res.price
+ setSlotsDetails(res.details)
+ else
+ # otherwise we alert, this error musn't occur when the current user is not admin
+ growl.warning(_t('please_select_a_member_first'))
+ $scope.amountTotal = null
+
+
+ setSlotsDetails = (details) ->
+ angular.forEach $scope.eventsReserved, (slot) ->
+ angular.forEach details.slots, (s) ->
+ if moment(s.start_at).isSame(slot.start)
+ slot.promo = s.promo
+ slot.price = s.price
+
+
+ ##
+ # Triggered when the user click on a reservation slot in the agenda.
+ # Defines the behavior to adopt depending on the slot status (already booked, free, ready to be reserved ...),
+ # the user's subscription (current or about to be took) and the time (the user cannot modify a booked reservation
+ # if it's too late).
+ ##
+ calendarEventClickCb = (event, jsEvent, view) ->
+
+ if !event.is_reserved && !$scope.slotToModify
+ index = $scope.eventsReserved.indexOf(event)
+ if index == -1
+ event.backgroundColor = FREE_SLOT_BORDER_COLOR
+ event.title = _t('i_reserve')
+ $scope.eventsReserved.push event
+ else
+ $scope.removeMachineSlot(event)
+ $scope.paidMachineSlots = null
+ $scope.selectedPlan = null
+ $scope.modifiedSlots = null
+ else if !event.is_reserved && $scope.slotToModify
+ if $scope.slotToPlace
+ $scope.slotToPlace.backgroundColor = 'white'
+ $scope.slotToPlace.title = ''
+ $scope.slotToPlace = event
+ event.backgroundColor = '#bbb'
+ event.title = _t('i_shift')
+ else if event.is_reserved and (slotCanBeModified(event) or slotCanBeCanceled(event)) and !$scope.slotToModify and $scope.eventsReserved.length == 0
+ event.movable = slotCanBeModified(event)
+ event.cancelable = slotCanBeCanceled(event)
+ dialogs.confirm
+ templateUrl: '<%= asset_path "shared/confirm_modify_slot_modal.html" %>'
+ resolve:
+ object: -> event
+ , (type) ->
+ if type == 'move'
+ $scope.modifiedSlots = null
+ $scope.slotToModify = event
+ event.backgroundColor = '#eee'
+ event.title = _t('i_change')
+ $scope.calendar.fullCalendar 'rerenderEvents'
+ else if type == 'cancel'
+ dialogs.confirm
+ resolve:
+ object: ->
+ title: _t('confirmation_required')
+ msg: _t('do_you_really_want_to_cancel_this_reservation')
+ , -> # cancel confirmed
+ Slot.cancel {id: event.id}, -> # successfully canceled
+ growl.success _t('reservation_was_cancelled_successfully')
+ $scope.canceledSlot = event
+ $scope.canceledSlot.backgroundColor = 'white'
+ $scope.canceledSlot.title = ''
+ $scope.canceledSlot.borderColor = FREE_SLOT_BORDER_COLOR
+ $scope.canceledSlot.id = null
+ $scope.canceledSlot.is_reserved = false
+ $scope.canceledSlot.can_modify = false
+ $scope.canceledSlot = null
+ $scope.calendar.fullCalendar 'rerenderEvents'
+ , -> # error while canceling
+ growl.error _t('cancellation_failed')
+ , ->
+ $scope.paidMachineSlots = null
+ $scope.selectedPlan = null
+ $scope.modifiedSlots = null
+
+ $scope.calendar.fullCalendar 'rerenderEvents'
+
+ updateCartPrice()
+
+
+
+
+ ##
+ # Triggered when fullCalendar tries to graphicaly render an event block.
+ # Append the event tag into the block, just after the event title.
+ # @see http://fullcalendar.io/docs/event_rendering/eventRender/
+ ##
+ eventRenderCb = (event, element) ->
+ if $scope.currentUser.role is 'admin' and event.tags.length > 0
+ html = ''
+ for tag in event.tags
+ html += "#{tag.name} "
+ element.find('.fc-time').append(html)
+
+
+
+ ##
+ # Open a modal window that allows the user to process a credit card payment for his current shopping cart.
+ ##
+ payByStripe = (reservation) ->
+
+ $uibModal.open
+ templateUrl: '<%= asset_path "stripe/payment_modal.html" %>'
+ size: 'md'
+ resolve:
+ reservation: ->
+ reservation
+ price: ->
+ Price.compute({reservation: reservation}).$promise
+ cgv: ->
+ CustomAsset.get({name: 'cgv-file'}).$promise
+ controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'cgv', 'Auth', 'Reservation', ($scope, $uibModalInstance, $state, reservation, price, cgv, Auth, Reservation) ->
+ # Price
+ $scope.amount = price.price
+
+ # CGV
+ $scope.cgv = cgv.custom_asset
+
+ # Reservation
+ $scope.reservation = reservation
+
+ ##
+ # Callback to process the payment with Stripe, triggered on button click
+ ##
+ $scope.payment = (status, response) ->
+ if response.error
+ growl.error(response.error.message)
+ else
+ $scope.attempting = true
+ $scope.reservation.card_token = response.id
+ Reservation.save reservation: $scope.reservation, (reservation) ->
+ $uibModalInstance.close(reservation)
+ , (response)->
+ $scope.alerts = []
+ $scope.alerts.push
+ msg: response.data.card[0]
+ type: 'danger'
+ $scope.attempting = false
+ ]
+ .result['finally'](null).then (reservation)->
+ afterPayment(reservation)
+
+
+
+ ##
+ # Open a modal window that allows the user to process a local payment for his current shopping cart (admin only).
+ ##
+ payOnSite = (reservation) ->
+
+ $uibModal.open
+ templateUrl: '<%= asset_path "shared/valid_reservation_modal.html" %>'
+ size: 'sm'
+ resolve:
+ reservation: ->
+ reservation
+ price: ->
+ Price.compute({reservation: reservation}).$promise
+ controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'Auth', 'Reservation', ($scope, $uibModalInstance, $state, reservation, price, Auth, Reservation) ->
+
+ # Price
+ $scope.amount = price.price
+
+ # Reservation
+ $scope.reservation = reservation
+
+ # Button label
+ if $scope.amount > 0
+ $scope.validButtonName = _t('confirm_(payment_on_site)')
+ else
+ $scope.validButtonName = _t('confirm')
+
+ ##
+ # Callback to process the local payment, triggered on button click
+ ##
+ $scope.ok = ->
+ $scope.attempting = true
+ Reservation.save reservation: $scope.reservation, (reservation) ->
+ $uibModalInstance.close(reservation)
+ $scope.attempting = true
+ , (response)->
+ $scope.alerts = []
+ $scope.alerts.push({msg: _t('a_problem_occured_during_the_payment_process_please_try_again_later'), type: 'danger' })
+ $scope.attempting = false
+ $scope.cancel = ->
+ $uibModalInstance.dismiss('cancel')
+ ]
+ .result['finally'](null).then (reservation)->
+ afterPayment(reservation)
+
+
+
+ ##
+ # Determines if the provided booked slot is able to be modified by the user.
+ # @param slot {Object} fullCalendar event object
+ ##
+ slotCanBeModified = (slot)->
+ return true if $scope.currentUser.role is 'admin'
+ slotStart = moment(slot.start)
+ now = moment()
+ if slot.can_modify and $scope.enableBookingMove and slotStart.diff(now, "hours") >= $scope.moveBookingDelay
+ return true
+ else
+ return false
+
+
+
+ ##
+ # Determines if the provided booked slot is able to be canceled by the user.
+ # @param slot {Object} fullCalendar event object
+ ##
+ slotCanBeCanceled = (slot) ->
+ return true if $scope.currentUser.role is 'admin'
+ slotStart = moment(slot.start)
+ now = moment()
+ if slot.can_modify and $scope.enableBookingCancel and slotStart.diff(now, "hours") >= $scope.cancelBookingDelay
+ return true
+ else
+ return false
+
+
+ ##
+ # Once the reservation is booked (payment process successfully completed), change the event style
+ # in fullCalendar, update the user's subscription and free-credits if needed
+ # @param reservation {Object}
+ ##
+ afterPayment = (reservation)->
+ angular.forEach $scope.eventsReserved, (machineSlot, key) ->
+ machineSlot.is_reserved = true
+ machineSlot.can_modify = true
+ if $scope.currentUser.role isnt 'admin'
+ machineSlot.title = _t('i_ve_reserved')
+ machineSlot.borderColor = BOOKED_SLOT_BORDER_COLOR
+ updateMachineSlot(machineSlot, reservation, $scope.currentUser)
+ else
+ machineSlot.title = _t('not_available')
+ machineSlot.borderColor = UNAVAILABLE_SLOT_BORDER_COLOR
+ updateMachineSlot(machineSlot, reservation, $scope.ctrl.member)
+ machineSlot.backgroundColor = 'white'
+ $scope.paidMachineSlots = $scope.eventsReserved
+
+ $scope.eventsReserved = []
+
+ if $scope.selectedPlan
+ $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan)
+ Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan)
+ $scope.plansAreShown = false
+
+ $scope.calendar.fullCalendar 'refetchEvents'
+ $scope.calendar.fullCalendar 'rerenderEvents'
+
+
+
+ ##
+ # After payment, update the id of the newly reserved slot with the id returned by the server.
+ # This will allow the user to modify the reservation he just booked. The associated user will also be registered
+ # with the slot.
+ # @param slot {Object}
+ # @param reservation {Object}
+ # @param user {Object} user associated with the slot
+ ##
+ updateMachineSlot = (slot, reservation, user)->
+ angular.forEach reservation.slots, (s)->
+ if slot.start.isSame(s.start_at)
+ slot.id = s.id
+ slot.user = user
+
+
+
+ ##
+ # Search for the requested plan in the provided array and return its price.
+ # @param plansArray {Array} full list of plans
+ # @param planId {Number} plan identifier
+ # @returns {Number|null} price of the given plan or null if not found
+ ##
+ findAmountByPlanId = (plansArray, planId)->
+ for plan in plansArray
+ return plan.amount if plan.plan_id == planId
+ return null
+
+
+ ## !!! MUST BE CALLED AT THE END of the controller
+ initialize()
]
diff --git a/app/assets/javascripts/controllers/main_nav.coffee.erb b/app/assets/javascripts/controllers/main_nav.coffee.erb
index 0f05d63c9..96b1c5775 100644
--- a/app/assets/javascripts/controllers/main_nav.coffee.erb
+++ b/app/assets/javascripts/controllers/main_nav.coffee.erb
@@ -3,55 +3,97 @@
##
# Navigation controller. List the links availables in the left navigation pane and their icon.
##
-Application.Controllers.controller "mainNavController", ["$scope", "$location", "$cookies", ($scope, $location, $cookies) ->
+Application.Controllers.controller "MainNavController", ["$scope", "$location", "$cookies", ($scope, $location, $cookies) ->
-## Common links (public application)
+ ## Common links (public application)
$scope.navLinks = [
{
state: 'app.public.home'
- linkText: 'Accueil'
+ linkText: 'home'
linkIcon: 'home'
}
{
state: 'app.public.machines_list'
- linkText: 'Liste des machines'
- linkIcon: 'gears'
+ linkText: 'reserve_a_machine'
+ linkIcon: 'calendar'
+ }
+ {
+ state: 'app.logged.trainings_reserve'
+ linkText: 'trainings_registrations'
+ linkIcon: 'graduation-cap'
}
{
state: 'app.public.events_list'
- linkText: 'Liste des stages et ateliers'
+ linkText: 'courses_and_workshops_registrations'
linkIcon: 'tags'
}
{
state: 'app.public.projects_list'
- linkText: 'Galerie de projets'
+ linkText: 'projects_gallery'
linkIcon: 'th'
}
+
]
- ## Admin links (backoffice application)
+ unless Fablab.withoutPlans
+ $scope.navLinks.push({
+ state: 'app.public.plans'
+ linkText: 'subscriptions'
+ linkIcon: 'credit-card'
+ })
+
+
$scope.adminNavLinks = [
+ {
+ state: 'app.admin.trainings'
+ linkText: 'trainings_monitoring'
+ linkIcon: 'graduation-cap'
+ }
+ {
+ state: 'app.admin.calendar'
+ linkText: 'manage_the_calendar'
+ linkIcon: 'calendar'
+ }
{
state: 'app.admin.members'
- linkText: 'Suivi utilisateurs'
+ linkText: 'manage_the_users'
linkIcon: 'users'
}
+ {
+ state: 'app.admin.invoices'
+ linkText: 'manage_the_invoices'
+ linkIcon: 'file-pdf-o'
+ }
+ {
+ state: 'app.admin.pricing'
+ linkText: 'subscriptions_and_prices'
+ linkIcon: 'money'
+ }
{
state: 'app.admin.events'
- linkText: 'Suivi stages et ateliers'
+ linkText: 'courses_and_workshops_monitoring'
linkIcon: 'tags'
}
{
state: 'app.public.machines_list'
- linkText: 'Gérer les machines'
+ linkText: 'manage_the_machines'
linkIcon: 'cogs'
}
{
state: 'app.admin.project_elements'
- linkText: 'Gérer les éléments Projets'
+ linkText: 'manage_the_projects_elements'
linkIcon: 'tasks'
}
+ {
+ state: 'app.admin.statistics'
+ linkText: 'statistics'
+ linkIcon: 'bar-chart-o'
+ }
+ {
+ state: 'app.admin.settings'
+ linkText: 'customization'
+ linkIcon: 'gear'
+ }
]
-
]
diff --git a/app/assets/javascripts/controllers/members.coffee b/app/assets/javascripts/controllers/members.coffee
index 594996380..bef2e9bed 100644
--- a/app/assets/javascripts/controllers/members.coffee
+++ b/app/assets/javascripts/controllers/members.coffee
@@ -3,23 +3,11 @@
##
# Controller used in the members listing page
##
-Application.Controllers.controller "membersController", ["$scope", "$state", 'Member', ($scope, $state, Member) ->
+Application.Controllers.controller "MembersController", ["$scope", 'membersPromise', ($scope, membersPromise) ->
## members list
- $scope.members = Member.query()
+ $scope.members = membersPromise
- ## Merbers ordering/sorting. Default: not sorted
- $scope.orderMember = null
-
- ##
- # Change the members ordering criterion to the one provided
- # @param orderBy {string} ordering criterion
- ##
- $scope.setOrderMember = (orderBy)->
- if $scope.orderMember == orderBy
- $scope.orderMember = '-'+orderBy
- else
- $scope.orderMember = orderBy
]
@@ -27,24 +15,71 @@ Application.Controllers.controller "membersController", ["$scope", "$state", 'Me
##
# Controller used when editing the current user's profile
##
-Application.Controllers.controller "editProfileController", ["$scope", "$state", "Member", "Auth", 'growl', 'dialogs', 'CSRF', ($scope, $state, Member, Auth, growl, dialogs, CSRF) ->
- CSRF.setMetaTags()
+Application.Controllers.controller "EditProfileController", ["$scope", "$rootScope", "$state", "$window", '$locale', "Member", "Auth", "Session", "activeProviderPromise", 'growl', 'dialogs', 'CSRF', 'memberPromise', 'groups', '_t'
+, ($scope, $rootScope, $state, $window, $locale, Member, Auth, Session, activeProviderPromise, growl, dialogs, CSRF, memberPromise, groups, _t) ->
+
+
+
+ ### PUBLIC SCOPE ###
## API URL where the form will be posted
$scope.actionUrl = "/api/members/" + $scope.currentUser.id
+ ## list of groups
+ $scope.groups = groups
+
## Form action on the above URL
$scope.method = 'patch'
## Current user's profile
- $scope.user = Member.get {id: $scope.currentUser.id}
+ $scope.user = memberPromise
+
+ ## default : do not show the group changing form
+ $scope.group =
+ change: false
+
+ ## group ID of the current/selected user
+ $scope.userGroup = memberPromise.group_id
+
+ ## active authentication provider parameters
+ $scope.activeProvider = activeProviderPromise
+
+ ## allow the user to change his password except if he connect from an SSO
+ $scope.preventPassword = false
+
+ ## mapping of fields to disable
+ $scope.preventField = {}
## Angular-Bootstrap datepicker configuration for birthday
$scope.datePicker =
- format: 'dd/MM/yyyy'
+ format: $locale.DATETIME_FORMATS.shortDate
opened: false # default: datePicker is not shown
options:
- startingDay: 1 # France: the week starts on monday
+ startingDay: Fablab.weekStartingDay
+
+
+
+ ##
+ # Return the group object, identified by the ID set in $scope.userGroup
+ ##
+ $scope.getUserGroup = ->
+ for group in $scope.groups
+ if group.id == $scope.userGroup
+ 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}}, (user) ->
+ $scope.user = user
+ $scope.group.change = false
+ growl.success(_t('your_group_has_been_successfully_changed'))
+ , (err) ->
+ growl.error(_t('an_unexpected_error_prevented_your_group_from_being_changed'))
+ console.error(err)
@@ -81,10 +116,32 @@ Application.Controllers.controller "editProfileController", ["$scope", "$state",
Auth._currentUser.name = content.name
$scope.currentUser = content
Auth._currentUser = content
+ $rootScope.currentUser = content
$state.go('app.public.home')
+ ##
+ # Ask for confirmation then delete the current user's account
+ # @param user {Object} the current user (to delete)
+ ##
+ $scope.deleteUser = (user)->
+ dialogs.confirm
+ resolve:
+ object: ->
+ 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 ->
+ $state.go('app.public.home')
+ growl.success(_t('your_user_account_has_been_successfully_deleted_goodbye'))
+ , (error)->
+ console.log(error)
+ 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.
# The preview may show a placeholder or the content of the file depending on the upload state.
@@ -95,6 +152,52 @@ Application.Controllers.controller "editProfileController", ["$scope", "$state",
'fileinput-exists'
else
'fileinput-new'
+
+
+ ##
+ # Check if the of the properties editable by the user are linked to the SSO
+ # @return {boolean} true if some editable fields are mapped with the SSO, false otherwise
+ ##
+ $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
+
+
+ ##
+ # Disconnect and re-connect the user to the SSO to force the synchronisation of the profile's data
+ ##
+ $scope.syncProfile = ->
+ Auth.logout().then (oldUser) ->
+ Session.destroy()
+ $rootScope.currentUser = null
+ $rootScope.toCheckNotifications = false
+ $scope.notifications = []
+ $window.location.href = $scope.activeProvider.link_to_sso_connect
+
+
+ ### PRIVATE SCOPE ###
+
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+ CSRF.setMetaTags()
+
+ # init the birth date to JS object
+ $scope.user.profile.birthday = moment($scope.user.profile.birthday).toDate()
+
+ if $scope.activeProvider.providable_type != 'DatabaseProvider'
+ $scope.preventPassword = true
+ # bind fields protection with sso fields
+ angular.forEach activeProviderPromise.mapping, (map) ->
+ $scope.preventField[map] = true
+
+
+
+
+ ## !!! MUST BE CALLED AT THE END of the controller
+ initialize()
]
@@ -102,8 +205,8 @@ Application.Controllers.controller "editProfileController", ["$scope", "$state",
##
# Controller used on the public user's profile page (seeing another user's profile)
##
-Application.Controllers.controller "showProfileController", ["$scope", "$stateParams", 'Member', ($scope, $stateParams, Member) ->
+Application.Controllers.controller "ShowProfileController", ["$scope", "$stateParams", 'Member', 'memberPromise', ($scope, $stateParams, Member, memberPromise) ->
## Selected user's profile (id from the current URL)
- $scope.user = Member.get {id: $stateParams.id}
+ $scope.user = memberPromise
]
diff --git a/app/assets/javascripts/controllers/notifications.coffee b/app/assets/javascripts/controllers/notifications.coffee
index 05c7457f6..3426aa1d0 100644
--- a/app/assets/javascripts/controllers/notifications.coffee
+++ b/app/assets/javascripts/controllers/notifications.coffee
@@ -4,7 +4,7 @@
# Controller used in notifications page
# inherits $scope.$parent.notifications (unread notifications) from ApplicationController
##
-Application.Controllers.controller "notificationsController", ["$scope", 'Notification', ($scope, Notification) ->
+Application.Controllers.controller "NotificationsController", ["$scope", 'Notification', ($scope, Notification) ->
@@ -32,7 +32,7 @@ Application.Controllers.controller "notificationsController", ["$scope", 'Notifi
# Mark the provided notification as read, updating its status on the server and moving it
# to the already read notifications list.
# @param notification {{id:number}} the notification to mark as read
- # @param e {Object} jQuery event object
+ # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
##
$scope.markAsRead = (notification, e) ->
e.preventDefault()
diff --git a/app/assets/javascripts/controllers/plans.coffee.erb b/app/assets/javascripts/controllers/plans.coffee.erb
new file mode 100644
index 000000000..0e0d3102b
--- /dev/null
+++ b/app/assets/javascripts/controllers/plans.coffee.erb
@@ -0,0 +1,232 @@
+'use strict'
+
+Application.Controllers.controller "PlansIndexController", ["$scope", "$state", '$uibModal', 'Auth', 'dialogs', 'growl', 'plansPromise', 'groupsPromise', 'Subscription', 'Member', 'subscriptionExplicationsPromise', '_t'
+, ($scope, $state, $uibModal, Auth, dialogs, growl, plansPromise, groupsPromise, Subscription, Member, subscriptionExplicationsPromise, _t) ->
+
+
+
+ ### PUBLIC SCOPE ###
+
+ ## list of groups
+ $scope.groups = groupsPromise
+
+ ## default : do not show the group changing form
+ $scope.changeGroup = false
+
+ ## group ID of the current/selected user
+ $scope.userGroup = null
+
+ ## list of plans, classified by group
+ $scope.plansClassifiedByGroup = []
+ for group in groupsPromise
+ groupObj = { id: group.id, name: group.name, plans: [] }
+ for plan in plansPromise
+ groupObj.plans.push(plan) if plan.group_id == group.id
+ $scope.plansClassifiedByGroup.push(groupObj)
+
+ ## user to deal with
+ $scope.ctrl =
+ member: null
+ member_id: null
+
+ ## already subscribed plan of the current user
+ $scope.paidPlan = null
+
+ ## plan to subscribe (shopping cart)
+ $scope.selectedPlan = null
+
+ ##
+ $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 = ->
+ $scope.selectedPlan = null
+ $scope.paidPlan = null
+ $scope.userGroup = $scope.ctrl.member.group_id
+ $scope.changeGroup = false
+
+
+
+ ##
+ # Add the provided plan to the shopping basket
+ # @param plan {Object} The plan to subscribe to
+ ##
+ $scope.selectPlan = (plan) ->
+ if $scope.isAuthenticated()
+ if $scope.selectedPlan != plan
+ $scope.selectedPlan = plan
+ else
+ $scope.selectedPlan = null
+ else
+ $scope.login()
+
+
+
+ ##
+ # Callback to trigger the payment process of the subscription
+ ##
+ $scope.openSubscribePlanModal = ->
+ if $scope.currentUser.role isnt 'admin'
+ payByStripe()
+ else
+ payOnSite()
+
+
+
+ ##
+ # Return the group object, identified by the ID set in $scope.userGroup
+ ##
+ $scope.getUserGroup = ->
+ for group in $scope.groups
+ if group.id == $scope.userGroup
+ return group
+
+
+
+ ##
+ # Change the group of the current/selected user to the one set in $scope.userGroup
+ ##
+ $scope.selectGroup = ->
+ Member.update {id: $scope.ctrl.member.id}, {user: {group_id: $scope.userGroup}}, (user) ->
+ $scope.ctrl.member = user
+ $scope.changeGroup = false
+ if $scope.currentUser.role isnt 'admin'
+ $scope.currentUser = user
+ growl.success(_t('your_group_was_successfully_changed'))
+ else
+ growl.success(_t('the_user_s_group_was_successfully_changed'))
+ , (err) ->
+ if $scope.currentUser.role isnt 'admin'
+ growl.error(_t('an_error_prevented_your_group_from_being_changed'))
+ else
+ growl.error(_t('an_error_prevented_to_change_the_user_s_group'))
+ console.error(err)
+
+
+ ##
+ # Return an enumerable meaninful string for the gender of the provider user
+ # @param user {Object} Database user record
+ # @return {string} 'male' or 'female'
+ ##
+ $scope.getGender = (user) ->
+ if user.profile
+ if user.profile.gender == "true" then 'male' else 'female'
+ else 'other'
+
+
+
+ ### PRIVATE SCOPE ###
+
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+ if $scope.currentUser
+ if $scope.currentUser.role isnt 'admin'
+ $scope.ctrl.member = $scope.currentUser
+ $scope.paidPlan = $scope.currentUser.subscribed_plan
+ $scope.userGroup = $scope.currentUser.group_id
+ else
+ Member.query {requested_attributes:'[subscription]'}, (members) ->
+ membersNoPlan = []
+ angular.forEach members, (v)->
+ membersNoPlan.push v unless v.subscribed_plan
+ $scope.members = membersNoPlan
+
+ $scope.$on 'devise:new-session', (event, user)->
+ $scope.ctrl.member = user
+
+
+ $scope.isInFuture = (dateTime)->
+ if moment().diff(moment(dateTime)) < 0
+ true
+ else
+ false
+
+ ##
+ # Open a modal window which trigger the stripe payment process
+ ##
+ payByStripe = ->
+ $uibModal.open
+ templateUrl: '<%= asset_path "stripe/payment_modal.html" %>'
+ size: 'md'
+ resolve:
+ selectedPlan: -> $scope.selectedPlan
+ member: -> $scope.ctrl.member
+ controller: ['$scope', '$uibModalInstance', '$state', 'selectedPlan', 'member', 'Subscription', 'CustomAsset', ($scope, $uibModalInstance, $state, selectedPlan, member, Subscription, CustomAsset) ->
+ $scope.amount = selectedPlan.amount
+ $scope.selectedPlan = selectedPlan
+ # retrieve the CGV
+ CustomAsset.get {name: 'cgv-file'}, (cgv) ->
+ $scope.cgv = cgv.custom_asset
+ $scope.payment = (status, response) ->
+ if response.error
+ growl.error(response.error.message)
+ else
+ $scope.attempting = true
+ Subscription.save
+ subscription:
+ plan_id: selectedPlan.id
+ user_id: member.id
+ card_token: response.id
+ , (data, status) -> # success
+ $uibModalInstance.close(data)
+ , (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
+ ]
+ .result['finally'](null).then (subscription)->
+ $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan)
+ Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan)
+ $scope.paidPlan = angular.copy($scope.selectedPlan)
+ $scope.selectedPlan = null
+
+
+
+ ##
+ # Open a modal window which trigger the local payment process
+ ##
+ payOnSite = ->
+ $uibModal.open
+ templateUrl: '<%= asset_path "plans/payment_modal.html" %>'
+ size: 'sm'
+ resolve:
+ selectedPlan: -> $scope.selectedPlan
+ member: -> $scope.ctrl.member
+ controller: ['$scope', '$uibModalInstance', '$state', 'selectedPlan', 'member', 'Subscription', ($scope, $uibModalInstance, $state, selectedPlan, member, Subscription) ->
+ $scope.plan = selectedPlan
+ $scope.member = member
+ $scope.ok = ->
+ $scope.attempting = true
+ Subscription.save
+ subscription:
+ plan_id: selectedPlan.id
+ user_id: member.id
+ , (data, status) -> # success
+ $uibModalInstance.close(data)
+ , (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.cancel = ->
+ $uibModalInstance.dismiss('cancel')
+ ]
+ .result['finally'](null).then (reservation)->
+ $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan)
+ Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan)
+ index = $scope.members.indexOf($scope.ctrl.member)
+ $scope.members.splice(index, 1)
+ $scope.ctrl.member = null
+ $scope.paidPlan = angular.copy($scope.selectedPlan)
+ $scope.selectedPlan = null
+
+
+
+ ## !!! MUST BE CALLED AT THE END of the controller
+ initialize()
+]
diff --git a/app/assets/javascripts/controllers/profile.coffee b/app/assets/javascripts/controllers/profile.coffee
new file mode 100644
index 000000000..9162f4d28
--- /dev/null
+++ b/app/assets/javascripts/controllers/profile.coffee
@@ -0,0 +1,152 @@
+
+'use strict'
+
+Application.Controllers.controller "CompleteProfileController", ["$scope", "$rootScope", "$state", "_t", "$locale", "growl", "CSRF", "Auth", "Member", "settingsPromise", "activeProviderPromise", "groupsPromise", "cguFile", "memberPromise"
+, ($scope, $rootScope, $state, _t, $locale, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise) ->
+
+
+
+ ### PUBLIC SCOPE ###
+
+ ## API URL where the form will be posted
+ $scope.actionUrl = "/api/members/" + memberPromise.id
+
+ ## Form action on the above URL
+ $scope.method = 'patch'
+
+ ## genre of the application name (eg. "_le_ Fablab" or "_la_ Fabrique")
+ $scope.nameGenre = settingsPromise.name_genre
+
+ ## name of the current fablab application (eg. "Fablab de la Casemate")
+ $scope.fablabName = settingsPromise.fablab_name
+
+ ## informations from the current SSO provider
+ $scope.activeProvider = activeProviderPromise
+
+ ## list of user's groups (student/standard/...)
+ $scope.groups = groupsPromise
+
+ ## current user, contains informations retrieved from the SSO
+ $scope.user = memberPromise
+
+ ## disallow the user to change his password as he connect from SSO
+ $scope.preventPassword = true
+
+ ## mapping of fields to disable
+ $scope.preventField = {}
+
+ ## CGU
+ $scope.cgu = cguFile.custom_asset
+
+ ## Angular-Bootstrap datepicker configuration for birthday
+ $scope.datePicker =
+ format: $locale.DATETIME_FORMATS.shortDate
+ opened: false # default: datePicker is not shown
+ 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 = ($event) ->
+ $event.preventDefault()
+ $event.stopPropagation()
+ $scope.datePicker.opened = true
+
+
+
+ ##
+ # For use with ngUpload (https://github.com/twilson63/ngUpload).
+ # Intended to be the callback when the upload is done: any raised error will be stacked in the
+ # $scope.alerts array. If everything goes fine, the user's profile is updated and the user is
+ # redirected to the home page
+ # @param content {Object} JSON - The upload's result
+ ##
+ $scope.submited = (content) ->
+ if !content.id?
+ $scope.alerts = []
+ angular.forEach content, (v, k)->
+ angular.forEach v, (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
+ $state.go('app.public.home')
+
+ ##
+ # For use with 'ng-class', returns the CSS class name for the uploads previews.
+ # The preview may show a placeholder or the content of the file depending on the upload state.
+ # @param v {*} any attribute, will be tested for truthiness (see JS evaluation rules)
+ ##
+ $scope.fileinputClass = (v)->
+ if v
+ 'fileinput-exists'
+ else
+ 'fileinput-new'
+
+
+
+ ##
+ # Merge the current user into the account with the given auth_token
+ ##
+ $scope.registerAuthToken = ->
+ Member.merge {id: $rootScope.currentUser.id}, {user: {auth_token: $scope.user.auth_token}}, (user) ->
+ $scope.user = user
+ Auth._currentUser = user
+ $rootScope.currentUser = user
+ $state.go('app.public.home')
+ , (err) ->
+ if err.data.error
+ growl.error(err.data.error)
+ else
+ 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 = ->
+ email = memberPromise.email
+ if email
+ duplicate = email.match(/^<([^>]+)>.{20}-duplicate$/)
+ if duplicate
+ return duplicate[1]
+ email
+
+
+
+ ### PRIVATE SCOPE ###
+
+
+
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+ CSRF.setMetaTags()
+
+ # init the birth date to JS object
+ $scope.user.profile.birthday = moment($scope.user.profile.birthday).toDate()
+
+ # bind fields protection with sso fields
+ angular.forEach activeProviderPromise.mapping, (map) ->
+ $scope.preventField[map] = true
+
+
+
+
+ ## !!! MUST BE CALLED AT THE END of the controller
+ initialize()
+
+]
\ No newline at end of file
diff --git a/app/assets/javascripts/controllers/projects.coffee b/app/assets/javascripts/controllers/projects.coffee.erb
similarity index 64%
rename from app/assets/javascripts/controllers/projects.coffee
rename to app/assets/javascripts/controllers/projects.coffee.erb
index 4fa8f55ae..700c79412 100644
--- a/app/assets/javascripts/controllers/projects.coffee
+++ b/app/assets/javascripts/controllers/projects.coffee.erb
@@ -144,30 +144,28 @@ class ProjectsController
##
# Controller used on projects listing page
##
-Application.Controllers.controller "projectsController", ["$scope", "$state", 'Project', 'Machine', 'Theme', 'Component', ($scope, $state, Project, Machine, Theme, Component) ->
-
-
+Application.Controllers.controller "ProjectsController", ["$scope", "$state", 'Project', 'machinesPromise', 'themesPromise', 'componentsPromise'
+, ($scope, $state, Project, machinesPromise, themesPromise, componentsPromise) ->
### PRIVATE STATIC CONSTANTS ###
# Number of notifications added to the page when the user clicks on 'load next notifications'
PROJECTS_PER_PAGE = 12
-
-
### PUBLIC SCOPE ###
+ $scope.search = { q: "", from: undefined, machine_id: undefined, component_id: undefined, theme_id: undefined }
## list of projects to display
$scope.projects = []
## list of machines / used for filtering
- $scope.machines = []
+ $scope.machines = machinesPromise
## list of themes / used for filtering
- $scope.themes = Theme.query()
+ $scope.themes = themesPromise
## list of components / used for filtering
- $scope.components = Component.query()
+ $scope.components = componentsPromise
## By default, the pagination mode is activated to limit the page size
$scope.paginateActive = true
@@ -175,19 +173,31 @@ Application.Controllers.controller "projectsController", ["$scope", "$state", 'P
## The currently displayed page number
$scope.page = 1
+ $scope.resetFilters = ->
+ $scope.search.q = ""
+ $scope.search.from = undefined
+ $scope.search.machine_id = undefined
+ $scope.search.component_id = undefined
+ $scope.search.theme_id = undefined
+ $scope.triggerSearch()
+ $scope.triggerSearch = ->
+ Project.search { search: $scope.search, page: 1 }, (projects)->
+ $scope.projects = projects
+ if projects.length < PROJECTS_PER_PAGE
+ $scope.paginateActive = false
+ else
+ $scope.paginateActive = true
+ $scope.page = 2
- ##
- # Request the server to retrieve the next undisplayed projects and add them
- # to the local projects list.
- ##
$scope.loadMoreProjects = ->
- Project.query {page: $scope.page}, (projects) ->
- $scope.projects = $scope.projects.concat projects
- $scope.paginateActive = false if projects.length < PROJECTS_PER_PAGE
-
- $scope.page += 1
-
+ # Project.query {page: $scope.page}, (projects) ->
+ # $scope.projects = $scope.projects.concat projects
+ # $scope.paginateActive = false if projects.length < PROJECTS_PER_PAGE
+ Project.search { search: $scope.search, page: $scope.page }, (projects)->
+ $scope.projects = $scope.projects.concat projects
+ $scope.paginateActive = false if projects.length < PROJECTS_PER_PAGE
+ $scope.page += 1
##
@@ -199,37 +209,9 @@ Application.Controllers.controller "projectsController", ["$scope", "$state", 'P
- ##
- # Callback to delete the provided project. Then, the projects list page is refreshed (admins only)
- ##
- $scope.delete = (project) ->
- # check the permissions
- if $scope.currentUser.role isnt 'admin'
- console.error 'Unauthorized operation'
- else
- # delete the project then refresh the projects list
- project.$delete ->
- $state.go('app.public.projects_list', {}, {reload: true})
+ ## initialization
+ $scope.triggerSearch()
-
-
- ### PRIVATE SCOPE ###
-
- ##
- # Kind of constructor: these actions will be realized first when the controller is loaded
- ##
- initialize = ->
- Machine.query().$promise.then (data)->
- $scope.machines = data.map (d) ->
- id: d.id
- name: d.name
-
- $scope.loadMoreProjects()
-
-
-
- ## !!! MUST BE CALLED AT THE END of the controller
- initialize()
]
@@ -237,7 +219,8 @@ Application.Controllers.controller "projectsController", ["$scope", "$state", 'P
##
# Controller used in the project creation page
##
-Application.Controllers.controller "newProjectController", ["$scope", "$state", 'Project', 'Machine', 'Member', 'Component', 'Theme', 'Licence', '$document', 'CSRF', ($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, CSRF) ->
+Application.Controllers.controller "NewProjectController", ["$scope", "$state", 'Project', 'Machine', 'Member', 'Component', 'Theme', 'Licence', '$document', 'CSRF'
+, ($scope, $state, Project, Machine, Member, Component, Theme, Licence, $document, CSRF) ->
CSRF.setMetaTags()
## API URL where the form will be posted
@@ -246,9 +229,6 @@ Application.Controllers.controller "newProjectController", ["$scope", "$state",
## Form action on the above URL
$scope.method = 'post'
- ## Button litteral text value
- $scope.submitName = 'Enregistrer comme brouillon'
-
## Default project parameters
$scope.project =
project_steps_attributes: []
@@ -271,7 +251,8 @@ Application.Controllers.controller "newProjectController", ["$scope", "$state",
##
# Controller used in the project edition page
##
-Application.Controllers.controller "editProjectController", ["$scope", "$state", '$stateParams', 'Project', 'Machine', 'Member', 'Component', 'Theme', 'Licence', '$document', 'CSRF', ($scope, $state, $stateParams, Project, Machine, Member, Component, Theme, Licence, $document, CSRF) ->
+Application.Controllers.controller "EditProjectController", ["$scope", "$state", '$stateParams', 'Project', 'Machine', 'Member', 'Component', 'Theme', 'Licence', '$document', 'CSRF', 'projectPromise'
+, ($scope, $state, $stateParams, Project, Machine, Member, Component, Theme, Licence, $document, CSRF, projectPromise) ->
CSRF.setMetaTags()
## API URL where the form will be posted
@@ -280,15 +261,8 @@ Application.Controllers.controller "editProjectController", ["$scope", "$state",
## Form action on the above URL
$scope.method = 'put'
- ## Button litteral text value
- $scope.submitName = 'Enregistrer'
-
## Retrieve the project's details, if an error occured, redirect the user to the projects list page
- $scope.project = Project.get {id: $stateParams.id}
- , -> # success
- return
- , -> # failed
- $state.go('app.public.projects_list')
+ $scope.project = projectPromise
## Other members list (project collaborators)
Member.query().$promise.then (data)->
@@ -307,18 +281,15 @@ Application.Controllers.controller "editProjectController", ["$scope", "$state",
##
# Controller used in the public project's details page
##
-Application.Controllers.controller "showProjectController", ["$scope", "$state", "$stateParams", "Project", '$location', ($scope, $state, $stateParams, Project, $location) ->
-
-
+Application.Controllers.controller "ShowProjectController", ["$scope", "$state", "projectPromise", '$location', '$uibModal', '_t'
+, ($scope, $state, projectPromise, $location, $uibModal, _t) ->
### PUBLIC SCOPE ###
- ## Will be set to true once the project details are loaded. Used to load the Disqus plugin at the right moment
- $scope.contentLoaded = false
-
## Store the project's details
- $scope.project = {}
-
+ $scope.project = projectPromise
+ $scope.projectUrl = $location.absUrl()
+ $scope.disqusShortname = Fablab.disqusShortname
##
@@ -336,23 +307,63 @@ Application.Controllers.controller "showProjectController", ["$scope", "$state",
- ### PRIVATE SCOPE ###
+ ##
+ # Test if the provided user has the deletion rights on the current project
+ # @param [user] {{id:number}} (optional) the user to check rights
+ # @returns boolean
+ ##
+ $scope.projectDeletableBy = (user) ->
+ return false if not user?
+ return true if $scope.project.author_id == user.id
+
+
##
- # Kind of constructor: these actions will be realized first when the controller is loaded
+ # Callback to delete the current project. Then, the user is redirected to the projects list page,
+ # which is refreshed. Admins and project owner only are allowed to delete a project
##
- initialize = ->
- ## Retrieve the project content
- $scope.project = Project.get {id: $stateParams.id}
- , -> # success
- $scope.contentLoaded = true
- $scope.project_url = $location.absUrl()
- return
- , -> # failed, redirect the user to the projects listing
- $state.go('app.public.projects_list')
+ $scope.deleteProject = ->
+ # check the permissions
+ if $scope.currentUser.role is 'admin' or $scope.projectDeletableBy($scope.currentUser)
+ # delete the project then refresh the projects list
+ $scope.project.$delete ->
+ $state.go('app.public.projects_list', {}, {reload: true})
+ else
+ 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 = (e) ->
+ e.preventDefault() if e
+ $uibModal.open
+ templateUrl: '<%= asset_path "shared/signalAbuseModal.html" %>'
+ size: 'md'
+ resolve:
+ project: -> $scope.project
+ controller: ['$scope', '$uibModalInstance', '_t', 'growl', 'Abuse', 'project', ($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 = ->
+ $uibModalInstance.dismiss('cancel')
+
+ # callback for form validation
+ $scope.ok = ->
+ Abuse.save {}, {abuse: $scope.signaler}, (res) ->
+ # creation successful
+ growl.success(_t('your_report_was_successful_thanks'))
+ $uibModalInstance.close(res)
+ , (error) ->
+ # creation failed...
+ growl.error(_t('an_error_occured_while_sending_your_report'))
+ ]
- ## !!! MUST BE CALLED AT THE END of the controller
- initialize()
]
diff --git a/app/assets/javascripts/controllers/trainings.coffee.erb b/app/assets/javascripts/controllers/trainings.coffee.erb
new file mode 100644
index 000000000..ee1f678f4
--- /dev/null
+++ b/app/assets/javascripts/controllers/trainings.coffee.erb
@@ -0,0 +1,658 @@
+'use strict'
+
+##
+# Controller used in the training reservation agenda page.
+# This controller is very similar to the machine reservation controller with one major difference: here, ONLY ONE
+# training can be reserved during the reservation process (the shopping cart may contains only one training and a subscription).
+##
+
+Application.Controllers.controller "ReserveTrainingController", ["$scope", "$state", '$stateParams', "$uibModal", 'Auth', 'dialogs', '$timeout', 'Price', 'Availability', 'Slot', 'Member', 'Setting', 'CustomAsset', '$compile', 'availabilityTrainingsPromise', 'plansPromise', 'groupsPromise', 'growl', 'settingsPromise', '_t',
+($scope, $state, $stateParams, $uibModal, Auth, dialogs, $timeout, Price, Availability, Slot, Member, Setting, CustomAsset, $compile, availabilityTrainingsPromise, plansPromise, groupsPromise, growl, settingsPromise, _t) ->
+
+
+
+ ### PRIVATE STATIC CONSTANTS ###
+
+ # The calendar is divided in slots of 60 minutes
+ BASE_SLOT = '01:00:00'
+
+ # The calendar will be initialized positioned under 9:00 AM
+ DEFAULT_CALENDAR_POSITION = '09:00:00'
+
+ # The user is unable to modify his already booked reservation 1 day before it occurs
+ PREVENT_BOOKING_MODIFICATION_DELAY = 1
+
+ # Color of the selected event backgound
+ SELECTED_EVENT_BG_COLOR = '#ffdd00'
+
+ # Slot already booked by the current user
+ FREE_SLOT_BORDER_COLOR = '#bd7ae9'
+
+
+
+ ### PUBLIC SCOPE ###
+
+ ## after fullCalendar loads, provides access to its methods through $scope.calendar.fullCalendar()
+ $scope.calendar = null
+
+ ## bind the trainings availabilities with full-Calendar events
+ $scope.eventSources = [ { events: availabilityTrainingsPromise, textColor: 'black' } ]
+
+ ## the user to deal with, ie. the current user for non-admins
+ $scope.ctrl =
+ member: {}
+
+ ## the full list of members, used by admin to select a user to interact with
+ $scope.members = []
+
+ ## list of plans, classified by group
+ $scope.plansClassifiedByGroup = []
+ for group in groupsPromise
+ groupObj = { id: group.id, name: group.name, plans: [] }
+ for plan in plansPromise
+ groupObj.plans.push(plan) if plan.group_id == group.id
+ $scope.plansClassifiedByGroup.push(groupObj)
+
+ ## indicates the state of the current view : calendar or plans informations
+ $scope.plansAreShown = false
+
+ ## indicates if the selected training was validated (ie. added to the shopping cart)
+ $scope.trainingIsValid = false
+
+ ## contains the selected training once it was payed, allows to display a firendly end-of-shopping message
+ $scope.paidTraining = null
+
+ ## will store the user's plan if he choosed to buy one
+ $scope.selectedPlan = null
+
+ ## fullCalendar event. Training slot that the user want to book
+ $scope.selectedTraining = null
+
+ ## fullCalendar event. An already booked slot that the user want to modify
+ $scope.slotToModify = null
+
+ ## Once a training reservation was modified, will contains {newReservedSlot:{}, oldReservedSlot:{}}
+ $scope.modifiedSlots = null
+
+ ## fullCalendar (v2) configuration
+ $scope.calendarConfig =
+ timezone: Fablab.timezone
+ lang: Fablab.fullcalendar_locale
+ header:
+ left: 'month agendaWeek'
+ center: 'title'
+ right: 'today prev,next'
+ firstDay: 1 # Week start on monday (France)
+ scrollTime: DEFAULT_CALENDAR_POSITION
+ slotDuration: BASE_SLOT
+ allDayDefault: false
+ minTime: '00:00:00'
+ maxTime: '24:00:00'
+ height: 'auto'
+ buttonIcons:
+ prev: 'left-single-arrow'
+ next: 'right-single-arrow'
+ timeFormat:
+ agenda:'H:mm'
+ month: 'H(:mm)'
+ axisFormat: 'H:mm'
+
+ allDaySlot: false
+ defaultView: 'agendaWeek'
+ editable: false
+ eventClick: (event, jsEvent, view) ->
+ calendarEventClickCb(event, jsEvent, view)
+ eventAfterAllRender: (view)->
+ $scope.events = $scope.calendar.fullCalendar 'clientEvents'
+ eventRender: (event, element, view) ->
+ eventRenderCb(event, element, view)
+
+ ## Custom settings
+ $scope.subscriptionExplicationsAlert = settingsPromise.subscription_explications_alert
+ $scope.trainingExplicationsAlert = settingsPromise.training_explications_alert
+ $scope.trainingInformationMessage = settingsPromise.training_information_message
+ $scope.enableBookingMove = (settingsPromise.booking_move_enable == "true")
+ $scope.moveBookingDelay = parseInt(settingsPromise.booking_move_delay)
+ $scope.enableBookingCancel = (settingsPromise.booking_cancel_enable == "true")
+ $scope.cancelBookingDelay = parseInt(settingsPromise.booking_cancel_delay)
+ $scope.calendarConfig.minTime = moment.duration(moment(settingsPromise.booking_window_start).format('HH:mm:ss'))
+ $scope.calendarConfig.maxTime = moment.duration(moment(settingsPromise.booking_window_end).format('HH:mm:ss'))
+
+
+
+ ##
+ # 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 = ->
+ if $scope.ctrl.member
+ Availability.trainings {member_id: $scope.ctrl.member.id}, (trainings) ->
+ $scope.calendar.fullCalendar 'removeEvents'
+ $scope.eventSources.push
+ events: trainings
+ textColor: 'black'
+ $scope.trainingIsValid = false
+ $scope.paidTraining = null
+ $scope.plansAreShown = false
+ $scope.selectedPlan = null
+ $scope.selectedTraining = null
+ $scope.slotToModify = null
+ $scope.modifiedSlots = null
+
+
+
+ ##
+ # Callback to mark the selected training as validated (add it to the shopping cart).
+ ##
+ $scope.validTraining = ->
+ $scope.trainingIsValid = true
+ $scope.updatePrices()
+
+
+
+ ##
+ # Remove the training from the shopping cart
+ # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
+ ##
+ $scope.removeTraining = (e) ->
+ e.preventDefault()
+
+ $scope.selectedTraining.backgroundColor = 'white'
+ $scope.selectedTraining = null
+ $scope.plansAreShown = false
+ $scope.selectedPlan = null
+ $scope.trainingIsValid = false
+ $timeout ->
+ $scope.calendar.fullCalendar 'refetchEvents'
+ $scope.calendar.fullCalendar 'rerenderEvents'
+
+
+
+ ##
+ # Validates the shopping chart and redirect the user to the payment step
+ ##
+ $scope.payTraining = ->
+
+ # first, we check that a user was selected
+ if Object.keys($scope.ctrl.member).length > 0
+ reservation = mkReservation($scope.ctrl.member, $scope.selectedTraining, $scope.selectedPlan)
+
+ if $scope.currentUser.role isnt 'admin' and $scope.amountTotal > 0
+ payByStripe(reservation)
+ else
+ if $scope.currentUser.role is 'admin' or $scope.amountTotal is 0
+ payOnSite(reservation)
+ else
+ # otherwise we alert, this error musn't occur when the current user is not admin
+ growl.error(_t('please_select_a_member_first'))
+
+
+
+ ##
+ # Add the provided plan to the current shopping cart
+ # @param plan {Object} the plan to subscribe
+ ##
+ $scope.selectPlan = (plan) ->
+ if $scope.isAuthenticated()
+ if $scope.selectedPlan != plan
+ $scope.selectedPlan = plan
+ $scope.updatePrices()
+ else
+ $scope.selectedPlan = null
+ $scope.updatePrices()
+ else
+ $scope.login null, ->
+ $scope.selectedPlan = plan
+ $scope.updatePrices()
+
+
+
+ ##
+ # 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 = (e)->
+ e.preventDefault()
+ $scope.plansAreShown = false
+ $scope.selectedPlan = null
+ $scope.updatePrices()
+
+ ##
+ # Switch the user's view from the reservation agenda to the plan subscription
+ ##
+ $scope.showPlans = ->
+ $scope.plansAreShown = true
+
+ ##
+ # Cancel the current booking modification, removing the previously booked slot from the selection
+ # @param e {Object} see https://docs.angularjs.org/guide/expression#-event-
+ ##
+ $scope.removeSlotToModify = (e) ->
+ e.preventDefault()
+ if $scope.slotToPlace
+ $scope.slotToPlace.backgroundColor = 'white'
+ $scope.slotToPlace.title = $scope.slotToPlace.training.name
+ $scope.slotToPlace = null
+ $scope.slotToModify.title = if $scope.currentUser.role isnt 'admin' then $scope.slotToModify.training.name + " - " + _t('i_ve_reserved') else $scope.slotToModify.training.name
+ $scope.slotToModify.backgroundColor = 'white'
+ $scope.slotToModify = null
+ $scope.calendar.fullCalendar 'rerenderEvents'
+
+
+
+ ##
+ # 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 = (e)->
+ e.preventDefault()
+ $scope.slotToPlace.backgroundColor = 'white'
+ $scope.slotToPlace.title = $scope.slotToPlace.training.name
+ $scope.slotToPlace = null
+ $scope.calendar.fullCalendar 'rerenderEvents'
+
+
+
+ ##
+ # When modifying an already booked reservation, confirm the modification.
+ ##
+ $scope.modifyTrainingSlot = ->
+ Slot.update {id: $scope.slotToModify.slot_id},
+ slot:
+ start_at: $scope.slotToPlace.start
+ end_at: $scope.slotToPlace.end
+ availability_id: $scope.slotToPlace.id
+ , -> # success
+ $scope.modifiedSlots =
+ newReservedSlot: $scope.slotToPlace
+ oldReservedSlot: $scope.slotToModify
+ $scope.slotToPlace.title = if $scope.currentUser.role isnt 'admin' then $scope.slotToPlace.training.name + " - " + _t('i_ve_reserved') else $scope.slotToPlace.training.name
+ $scope.slotToPlace.backgroundColor = 'white'
+ $scope.slotToPlace.borderColor = $scope.slotToModify.borderColor
+ $scope.slotToPlace.slot_id = $scope.slotToModify.slot_id
+ $scope.slotToPlace.is_reserved = true
+ $scope.slotToPlace.can_modify = true
+ $scope.slotToPlace = null
+
+ $scope.slotToModify.backgroundColor = 'white'
+ $scope.slotToModify.title = $scope.slotToModify.training.name
+ $scope.slotToModify.borderColor = FREE_SLOT_BORDER_COLOR
+ $scope.slotToModify.slot_id = null
+ $scope.slotToModify.is_reserved = false
+ $scope.slotToModify.can_modify = false
+ $scope.slotToModify.is_completed = false if $scope.slotToModify.is_completed
+ $scope.slotToModify = null
+ $scope.calendar.fullCalendar 'rerenderEvents'
+ , -> # failure
+ growl.error('an_error_occured_preventing_the_booked_slot_from_being_modified')
+
+
+
+ ##
+ # Cancel the current booking modification, reseting the whole process
+ ##
+ $scope.cancelModifyMachineSlot = ->
+ $scope.slotToPlace.backgroundColor = 'white'
+ $scope.slotToPlace.title = $scope.slotToPlace.training.name
+ $scope.slotToPlace = null
+ $scope.slotToModify.title = if $scope.currentUser.role isnt 'admin' then $scope.slotToModify.training.name + " - " + _t('i_ve_reserved') else $scope.slotToModify.training.name
+ $scope.slotToModify.backgroundColor = 'white'
+ $scope.slotToModify = null
+ $scope.calendar.fullCalendar 'rerenderEvents'
+
+
+
+ ##
+ # Update the prices, based on the current selection
+ ##
+ $scope.updatePrices = ->
+ if Object.keys($scope.ctrl.member).length > 0
+ r = mkReservation($scope.ctrl.member, $scope.selectedTraining, $scope.selectedPlan)
+ Price.compute {reservation: r}, (res) ->
+ $scope.amountTotal = res.price
+ else
+ $scope.amountTotal = null
+
+
+
+ ### PRIVATE SCOPE ###
+
+ ##
+ # Kind of constructor: these actions will be realized first when the controller is loaded
+ ##
+ initialize = ->
+ if $scope.currentUser.role isnt 'admin'
+ Member.get id: $scope.currentUser.id, (member) ->
+ $scope.ctrl.member = member
+ else
+ Member.query {requested_attributes:'[subscription,credits]'}, (members) ->
+ $scope.members = members
+
+
+
+ ##
+ # Create an hash map implementing the Reservation specs
+ # @param member {Object} User as retreived from the API: current user / selected user if current is admin
+ # @param training {Object} fullCalendar event: training slot selected on the calendar
+ # @param [plan] {Object} Plan as retrived from the API: plan to buy with the current reservation
+ # @return {{user_id:Number, reservable_id:Number, reservable_type:String, slots_attributes:Array, plan_id:Number|null}}
+ ##
+ mkReservation = (member, training, plan = null) ->
+ reservation =
+ user_id: member.id
+ reservable_id: training.training.id
+ reservable_type: 'Training'
+ slots_attributes: []
+ plan_id: (plan.id if plan)
+
+ reservation.slots_attributes.push
+ start_at: training.start
+ end_at: training.end
+ availability_id: training.id
+ offered: training.offered || false
+
+ reservation
+
+
+
+ ##
+ # Triggered when the user clicks on a reservation slot in the agenda.
+ # Defines the behavior to adopt depending on the slot status (already booked, free, ready to be reserved ...),
+ # the user's subscription (current or about to be took) and the time (the user cannot modify a booked reservation
+ # if it's too late).
+ # @see http://fullcalendar.io/docs/mouse/eventClick/
+ ##
+ calendarEventClickCb = (event, jsEvent, view) ->
+ if $scope.ctrl.member
+ # reserve a training if this training will not be reserved and is not about to move and not is completed
+ if !event.is_reserved && !$scope.slotToModify && !event.is_completed
+ if event != $scope.selectedTraining
+ $scope.selectedTraining = event
+ $scope.selectedTraining.offered = false
+ event.backgroundColor = SELECTED_EVENT_BG_COLOR
+ computeTrainingAmount($scope.selectedTraining)
+ else
+ $scope.selectedTraining = null
+ event.backgroundColor = 'white'
+ $scope.trainingIsValid = false
+ $scope.paidTraining = null
+ $scope.selectedPlan = null
+ $scope.modifiedSlots = null
+ # clean all others events background
+ angular.forEach $scope.events, (e)->
+ if event.id != e.id
+ e.backgroundColor = 'white'
+ $scope.calendar.fullCalendar 'rerenderEvents'
+ # two if below for move training reserved
+ # if training isnt reserved and have a training to modify and same training and not complete
+ else if !event.is_reserved && $scope.slotToModify && slotCanBePlaced(event)
+ if $scope.slotToPlace
+ $scope.slotToPlace.backgroundColor = 'white'
+ $scope.slotToPlace.title = event.training.name
+ $scope.slotToPlace = event
+ event.backgroundColor = '#bbb'
+ event.title = event.training.name + ' - ' + _t('i_shift')
+ $scope.calendar.fullCalendar 'rerenderEvents'
+ # if training reserved can modify
+ else if event.is_reserved and (slotCanBeModified(event) or slotCanBeCanceled(event)) and !$scope.slotToModify and !$scope.selectedTraining
+ event.movable = slotCanBeModified(event)
+ event.cancelable = slotCanBeCanceled(event)
+ if $scope.currentUser.role is 'admin'
+ event.user =
+ name: $scope.ctrl.member.name
+ dialogs.confirm
+ templateUrl: '<%= asset_path "shared/confirm_modify_slot_modal.html" %>'
+ resolve:
+ object: -> event
+ , (type) -> # success
+ if type == 'move'
+ $scope.modifiedSlots = null
+ $scope.slotToModify = event
+ event.backgroundColor = '#eee'
+ event.title = event.training.name + ' - ' + _t('i_change')
+ $scope.calendar.fullCalendar 'rerenderEvents'
+ else if type == 'cancel'
+ dialogs.confirm
+ resolve:
+ object: ->
+ title: _t('confirmation_required')
+ msg: _t('do_you_really_want_to_cancel_this_reservation')
+ , -> # cancel confirmed
+ Slot.cancel {id: event.slot_id}, -> # successfully canceled
+ growl.success _t('reservation_was_successfully_cancelled')
+ $scope.canceledSlot = event
+ $scope.canceledSlot.backgroundColor = 'white'
+ $scope.canceledSlot.title = event.training.name
+ $scope.canceledSlot.borderColor = FREE_SLOT_BORDER_COLOR
+ $scope.canceledSlot.slot_id = null
+ $scope.canceledSlot.is_reserved = false
+ $scope.canceledSlot.can_modify = false
+ $scope.canceledSlot.is_completed = false if event.is_completed
+ $scope.canceledSlot = null
+ $scope.calendar.fullCalendar 'rerenderEvents'
+ , -> # error while canceling
+ growl.error _t('cancellation_failed')
+ , -> # canceled
+ $scope.paidMachineSlots = null
+ $scope.selectedPlan = null
+ $scope.modifiedSlots = null
+
+
+
+ ##
+ # When events are rendered, adds attributes for popover and compile
+ # @see http://fullcalendar.io/docs/event_rendering/eventRender/
+ ##
+ eventRenderCb = (event, element, view)->
+ element.attr(
+ 'uib-popover': event.training.description
+ 'popover-trigger': 'mouseenter'
+ 'popover-append-to-body': true
+ )
+ $compile(element)($scope)
+
+
+
+ ##
+ # Open a modal window that allows the user to process a credit card payment for his current shopping cart.
+ ##
+ payByStripe = (reservation) ->
+
+ $uibModal.open
+ templateUrl: '<%= asset_path "stripe/payment_modal.html" %>'
+ size: 'md'
+ resolve:
+ reservation: ->
+ reservation
+ price: ->
+ Price.compute({reservation: reservation}).$promise
+ cgv: ->
+ CustomAsset.get({name: 'cgv-file'}).$promise
+ controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'cgv', 'Auth', 'Reservation', ($scope, $uibModalInstance, $state, reservation, price, cgv, Auth, Reservation) ->
+ # Price
+ $scope.amount = price.price
+
+ # CGV
+ $scope.cgv = cgv.custom_asset
+
+ # Reservation
+ $scope.reservation = reservation
+
+ ##
+ # Callback to process the payment with Stripe, triggered on button click
+ ##
+ $scope.payment = (status, response) ->
+ if response.error
+ growl.error(response.error.message)
+ else
+ $scope.attempting = true
+ $scope.reservation.card_token = response.id
+ Reservation.save reservation: $scope.reservation, (reservation) ->
+ $uibModalInstance.close(reservation)
+ , (response)->
+ $scope.alerts = []
+ if response.data.card
+ $scope.alerts.push
+ msg: response.data.card[0]
+ type: 'danger'
+ else
+ $scope.alerts.push({msg: _t('a_problem_occured_during_the_payment_process_please_try_again_later'), type: 'danger' })
+ $scope.attempting = false
+ ]
+ .result['finally'](null).then (reservation)->
+ afterPayment(reservation)
+
+
+
+ ##
+ # Open a modal window that allows the user to process a local payment for his current shopping cart (admin only).
+ ##
+ payOnSite = (reservation) ->
+
+ $uibModal.open
+ templateUrl: '<%= asset_path "shared/valid_reservation_modal.html" %>'
+ size: 'sm'
+ resolve:
+ reservation: ->
+ reservation
+ price: ->
+ Price.compute({reservation: reservation}).$promise
+ controller: ['$scope', '$uibModalInstance', '$state', 'reservation', 'price', 'Auth', 'Reservation', ($scope, $uibModalInstance, $state, reservation, price, Auth, Reservation) ->
+ # Price
+ $scope.amount = price.price
+
+ # Reservation
+ $scope.reservation = reservation
+
+ # Button label
+ if $scope.amount > 0
+ $scope.validButtonName = _t('confirm_(payment_on_site)')
+ else
+ $scope.validButtonName = _t('confirm')
+
+ ##
+ # Callback to process the local payment, triggered on button click
+ ##
+ $scope.ok = ->
+ $scope.attempting = true
+ Reservation.save reservation: $scope.reservation, (reservation) ->
+ $uibModalInstance.close(reservation)
+ $scope.attempting = true
+ , (response)->
+ $scope.alerts = []
+ $scope.alerts.push({msg: _t('a_problem_occured_during_the_payment_process_please_try_again_later'), type: 'danger' })
+ $scope.attempting = false
+ $scope.cancel = ->
+ $uibModalInstance.dismiss('cancel')
+ ]
+ .result['finally'](null).then (reservation)->
+ afterPayment(reservation)
+
+
+
+ ##
+ # Computes the training amount depending of the member's credit
+ # @param training {Object} training slot
+ ##
+ computeTrainingAmount = (training)->
+ # first we check that a user was selected
+ if Object.keys($scope.ctrl.member).length > 0
+ r = mkReservation($scope.ctrl.member, training) # reservation without any Plan -> we get the training price
+ Price.compute {reservation: r}, (res) ->
+ $scope.selectedTrainingAmount = res.price
+ else
+ $scope.selectedTrainingAmount = null
+
+
+
+ ##
+ # Once the reservation is booked (payment process successfully completed), change the event style
+ # in fullCalendar, update the user's subscription and free-credits if needed
+ # @param reservation {Object}
+ ##
+ afterPayment = (reservation)->
+ $scope.paidTraining = $scope.selectedTraining
+ $scope.paidTraining.backgroundColor = 'white'
+ $scope.paidTraining.is_reserved = true
+ $scope.paidTraining.can_modify = true
+ updateTrainingSlotId($scope.paidTraining, reservation)
+ $scope.paidTraining.borderColor = '#b2e774'
+ $scope.paidTraining.title = $scope.paidTraining.training.name + " - " + _t('i_ve_reserved')
+
+ $scope.selectedTraining = null
+ $scope.trainingIsValid = false
+
+ 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.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.calendar.fullCalendar 'refetchEvents'
+ $scope.calendar.fullCalendar 'rerenderEvents'
+
+
+
+ ##
+ # Determines if the provided booked slot is able to be modified by the user.
+ # @param slot {Object} fullCalendar event object
+ ##
+ slotCanBeModified = (slot)->
+ return true if $scope.currentUser.role is 'admin'
+ slotStart = moment(slot.start)
+ now = moment(new Date())
+ if slot.can_modify and $scope.enableBookingMove and slotStart.diff(now, "hours") >= $scope.moveBookingDelay
+ return true
+ else
+ return false
+
+
+
+ ##
+ # Determines if the provided booked slot is able to be canceled by the user.
+ # @param slot {Object} fullCalendar event object
+ ##
+ slotCanBeCanceled = (slot) ->
+ return true if $scope.currentUser.role is 'admin'
+ slotStart = moment(slot.start)
+ now = moment()
+ if slot.can_modify and $scope.enableBookingCancel and slotStart.diff(now, "hours") >= $scope.cancelBookingDelay
+ return true
+ else
+ return false
+
+
+
+ ##
+ # For booking modifications, checks that the newly selected slot is valid
+ # @param slot {Object} fullCalendar event object
+ ##
+ slotCanBePlaced = (slot)->
+ if slot.training.id == $scope.slotToModify.training.id and !slot.is_completed
+ return true
+ else
+ return false
+
+
+
+ ##
+ # After payment, update the id of the newly reserved slot with the id returned by the server.
+ # This will allow the user to modify the reservation he just booked.
+ # @param slot {Object}
+ # @param reservation {Object}
+ ##
+ updateTrainingSlotId = (slot, reservation)->
+ angular.forEach reservation.slots, (s)->
+ if slot.start_at == slot.start_at
+ slot.slot_id = s.id
+
+
+
+ ## !!! MUST BE CALLED AT THE END of the controller
+ initialize()
+
+]
diff --git a/app/assets/javascripts/directives/bs-jasny-fileinput.js b/app/assets/javascripts/directives/bs-jasny-fileinput.js
index b95a615fc..0c178aff6 100644
--- a/app/assets/javascripts/directives/bs-jasny-fileinput.js
+++ b/app/assets/javascripts/directives/bs-jasny-fileinput.js
@@ -28,7 +28,7 @@ Application.Directives.directive('bsJasnyFileinput', [function(){
ngModelCtrl.$setValidity('filetype', true);
else
ngModelCtrl.$setValidity('filetype', false);
- }
+ };
}
$scope.$apply();
});
diff --git a/app/assets/javascripts/directives/confirmation_needed.coffee b/app/assets/javascripts/directives/confirmation_needed.coffee
new file mode 100644
index 000000000..76b026112
--- /dev/null
+++ b/app/assets/javascripts/directives/confirmation_needed.coffee
@@ -0,0 +1,20 @@
+Application.Directives.directive 'confirmationNeeded', [->
+ return {
+ priority: 1
+ terminal: true
+ link: (scope, element, attrs)->
+ msg = attrs.confirmationNeeded || "Are you sure?"
+ clickAction = attrs.ngClick
+ element.bind 'click', ->
+ if attrs.confirmationNeededIf?
+ confirmNeededIf = scope.$eval(attrs.confirmationNeededIf)
+ if confirmNeededIf == true
+ if ( window.confirm(msg) )
+ scope.$eval(clickAction)
+ else
+ scope.$eval(clickAction)
+ else
+ if ( window.confirm(msg) )
+ scope.$eval(clickAction)
+ }
+]
diff --git a/app/assets/javascripts/directives/directives.coffee b/app/assets/javascripts/directives/directives.coffee
index 8c4d5a748..0d00b4986 100644
--- a/app/assets/javascripts/directives/directives.coffee
+++ b/app/assets/javascripts/directives/directives.coffee
@@ -21,6 +21,8 @@ Application.Directives.directive 'bsHolder', [ ->
{
link: (scope, element, attrs) ->
Holder.addTheme("icon", { background: "white", foreground: "#e9e9e9", size: 80, font: "FontAwesome"})
+ .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])
return
@@ -66,3 +68,38 @@ Application.Directives.directive "disableAnimation", ($animate) ->
attrs.$observe "disableAnimation", (value) ->
$animate.enabled not value, elem
+
+##
+# Isolate a form's scope from its parent : no nested validation
+##
+Application.Directives.directive 'isolateForm', [ ->
+ {
+ restrict: 'A',
+ require: '?form'
+ link: (scope, elm, attrs, ctrl) ->
+ return unless ctrl
+
+ # Do a copy of the controller
+ ctrlCopy = {}
+ angular.copy(ctrl, ctrlCopy)
+
+ # Get the form's parent
+ parent = elm.parent().controller('form')
+ # Remove parent link to the controller
+ parent.$removeControl(ctrl)
+
+ # Replace form controller with a "isolated form"
+ isolatedFormCtrl =
+ $setValidity: (validationToken, isValid, control) ->
+ ctrlCopy.$setValidity(validationToken, isValid, control);
+ parent.$setValidity(validationToken, true, ctrl);
+
+ $setDirty: ->
+ elm.removeClass('ng-pristine').addClass('ng-dirty');
+ ctrl.$dirty = true;
+ ctrl.$pristine = false;
+
+ angular.extend(ctrl, isolatedFormCtrl)
+
+ }
+]
\ No newline at end of file
diff --git a/app/assets/javascripts/directives/stripe-angular.js b/app/assets/javascripts/directives/stripe-angular.js
new file mode 100644
index 000000000..9f9dbb182
--- /dev/null
+++ b/app/assets/javascripts/directives/stripe-angular.js
@@ -0,0 +1,24 @@
+'use strict';
+
+// https://github.com/gtramontina/stripe-angular
+
+Application.Directives.directive('stripeForm', ['$window',
+ function($window) {
+ var directive = { restrict: 'A' };
+ directive.link = function(scope, element, attributes) {
+ var form = angular.element(element);
+ form.bind('submit', function() {
+ var button = form.find('button');
+ button.prop('disabled', true);
+ $window.Stripe.createToken(form[0], function() {
+ var args = arguments;
+ scope.$apply(function() {
+ scope[attributes.stripeForm].apply(scope, args);
+ });
+ //button.prop('disabled', false);
+ });
+ });
+ };
+ return directive;
+
+ }]);
diff --git a/app/assets/javascripts/directives/validators.coffee b/app/assets/javascripts/directives/validators.coffee
new file mode 100644
index 000000000..71f19c80a
--- /dev/null
+++ b/app/assets/javascripts/directives/validators.coffee
@@ -0,0 +1,34 @@
+'use strict'
+
+Application.Directives.directive 'url', [ ->
+ URL_REGEXP = /^(https?:\/\/)([\da-z\.-]+)\.([-a-z0-9\.]{2,30})([\/\w \.-]*)*\/?$/
+ {
+ require: 'ngModel'
+ link: (scope, element, attributes, ctrl) ->
+ ctrl.$validators.url = (modelValue, viewValue) ->
+ if ctrl.$isEmpty(modelValue)
+ return true
+ if URL_REGEXP.test(viewValue)
+ return true
+
+ # otherwise, this is invalid
+ return false
+ }
+]
+
+
+Application.Directives.directive 'endpoint', [ ->
+ ENDPOINT_REGEXP = /^\/([-._~:?#\[\]@!$&'()*+,;=%\w]+\/?)*$/
+ {
+ require: 'ngModel'
+ link: (scope, element, attributes, ctrl) ->
+ ctrl.$validators.endpoint = (modelValue, viewValue) ->
+ if ctrl.$isEmpty(modelValue)
+ return true
+ if ENDPOINT_REGEXP.test(viewValue)
+ return true
+
+ # otherwise, this is invalid
+ return false
+ }
+]
\ No newline at end of file
diff --git a/app/assets/javascripts/filters/filters.coffee b/app/assets/javascripts/filters/filters.coffee
index e3277355a..2f3090870 100644
--- a/app/assets/javascripts/filters/filters.coffee
+++ b/app/assets/javascripts/filters/filters.coffee
@@ -1,7 +1,19 @@
'use strict'
+Application.Filters.filter 'array', [ ->
+ (arrayLength) ->
+ if (arrayLength)
+ arrayLength = Math.ceil(arrayLength)
+ arr = new Array(arrayLength)
+
+ for i in [0 ... arrayLength]
+ arr[i] = i
+
+ arr
+]
+
# filter for projects and trainings
-Application.Controllers.filter "machineFilter", [ ->
+Application.Filters.filter "machineFilter", [ ->
(elements, selectedMachine) ->
if !angular.isUndefined(elements) and !angular.isUndefined(selectedMachine) and elements? and selectedMachine?
filteredElements = []
@@ -13,7 +25,7 @@ Application.Controllers.filter "machineFilter", [ ->
elements
]
-Application.Controllers.filter "projectMemberFilter", [ "Auth", (Auth)->
+Application.Filters.filter "projectMemberFilter", [ "Auth", (Auth)->
(projects, selectedMember) ->
if !angular.isUndefined(projects) and angular.isDefined(selectedMember) and projects? and selectedMember? and selectedMember != ""
filteredProject = []
@@ -32,7 +44,7 @@ Application.Controllers.filter "projectMemberFilter", [ "Auth", (Auth)->
projects
]
-Application.Controllers.filter "themeFilter", [ ->
+Application.Filters.filter "themeFilter", [ ->
(projects, selectedTheme) ->
if !angular.isUndefined(projects) and !angular.isUndefined(selectedTheme) and projects? and selectedTheme?
filteredProjects = []
@@ -44,7 +56,7 @@ Application.Controllers.filter "themeFilter", [ ->
projects
]
-Application.Controllers.filter "componentFilter", [ ->
+Application.Filters.filter "componentFilter", [ ->
(projects, selectedComponent) ->
if !angular.isUndefined(projects) and !angular.isUndefined(selectedComponent) and projects? and selectedComponent?
filteredProjects = []
@@ -56,7 +68,7 @@ Application.Controllers.filter "componentFilter", [ ->
projects
]
-Application.Controllers.filter "projectsByAuthor", [ ->
+Application.Filters.filter "projectsByAuthor", [ ->
(projects, authorId) ->
if !angular.isUndefined(projects) and angular.isDefined(authorId) and projects? and authorId? and authorId != ""
filteredProject = []
@@ -68,7 +80,7 @@ Application.Controllers.filter "projectsByAuthor", [ ->
projects
]
-Application.Controllers.filter "projectsCollabored", [ ->
+Application.Filters.filter "projectsCollabored", [ ->
(projects, memberId) ->
if !angular.isUndefined(projects) and angular.isDefined(memberId) and projects? and memberId? and memberId != ""
filteredProject = []
@@ -81,24 +93,84 @@ Application.Controllers.filter "projectsCollabored", [ ->
]
# depend on humanize.js lib in /vendor
-Application.Controllers.filter "humanize", [ ->
+Application.Filters.filter "humanize", [ ->
(element, param) ->
Humanize.truncate(element, param, null)
]
-Application.Controllers.filter "breakFilter", [ ->
+Application.Filters.filter "breakFilter", [ ->
(text) ->
if text != undefined
text.replace(/\n/g, '`, ``, and ``.
// $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
@@ -952,16 +952,16 @@ $hr-border: $gray-lighter !default;
@import "bootstrap/input-groups";
@import "bootstrap/navs";
@import "bootstrap/navbar";
-// @import "bootstrap/breadcrumbs";
+@import "bootstrap/breadcrumbs";
@import "bootstrap/pagination";
-// @import "bootstrap/pager";
+@import "bootstrap/pager";
@import "bootstrap/labels";
@import "bootstrap/badges";
-//@import "bootstrap/jumbotron";
+@import "bootstrap/jumbotron";
@import "bootstrap/thumbnails";
@import "bootstrap/alerts";
@import "bootstrap/progress-bars";
-// @import "bootstrap/media";
+@import "bootstrap/media";
@import "bootstrap/list-group";
@import "bootstrap/panels";
@import "bootstrap/responsive-embed";
diff --git a/app/assets/stylesheets/modules/invoice.scss b/app/assets/stylesheets/modules/invoice.scss
new file mode 100644
index 000000000..452138f54
--- /dev/null
+++ b/app/assets/stylesheets/modules/invoice.scss
@@ -0,0 +1,181 @@
+
+// admin invoices
+
+.invoice-placeholder {
+ width: 80%;
+ max-width: 800px;
+ height: 100%;
+ margin: auto;
+ margin-top: 2em;
+ border-width: 1px;
+ border-style: solid;
+ border-color: #aeaeae #979797 #7b7b7b;
+ box-shadow: 2px 3px 6px 0 #898989,
+ -2px 3px 6px 0 #898989;
+ padding: 2em;
+
+ .invoice-buyer-infos {
+ float: right;
+ text-align: right;
+ margin-left: 1em;
+ }
+
+ .invoice-logo {
+ height: 6em;
+ width: 100%;
+ position: relative;
+ background-size: cover;
+ background-repeat: no-repeat;
+
+ img {
+ display: block;
+ width: auto;
+ max-height: 100%;
+ max-width: 60%;
+ }
+
+ &:hover .tools-box {
+ opacity: 1;
+ }
+
+ .tools-box {
+ opacity: 0;
+ position: absolute;
+ bottom: 10px;
+ left: 0;
+ right: 0;
+ text-align: center;
+ }
+ }
+
+ .invoice-object, .invoice-data, .invoice-data p, .invoice-text, .invoice-legals {
+ margin-top: 2em;
+ }
+
+ .invoice-data table {
+ width: 100%
+ }
+
+ .invoice-data tr, .invoice-data th, .invoice-data td {
+ border: 1px solid;
+ padding: 4px;
+ }
+
+ .invoice-text {
+ font-weight: bold;
+ }
+
+ .invoice-legals {
+ text-align: right;
+ }
+
+ .invoice-editable:hover {
+ background-color: $yellow;
+ overflow-x: hidden;
+ }
+
+ .invoice-activable {
+ font-style: italic;
+ color: #c4c4c4;
+ overflow-x: hidden;
+ }
+
+ .invoice-activable:hover {
+ background-color: $yellow;
+ border: 1px dashed #c4c4c4;
+ }
+
+
+ &:after {
+ content:"";
+ display:block;
+ margin-top:30%;
+ }
+
+ .vat-line {
+ background-color: #e4e4e4;
+ text-align: right;
+ }
+
+ .bold {
+ font-weight: bold;
+ }
+
+ .italic {
+ font-style: italic;
+ }
+
+ .right {
+ text-align: right;
+ }
+
+}
+
+.custom-invoice {
+ .modal-header {
+ @extend .modal-header;
+ // padding-left: 4em;
+ text-align: center;
+ background-color: #e6e6e6;
+ }
+
+ .modal-body {
+
+ .elements ul {
+ @extend .list-unstyled;
+ }
+
+ .elements li {
+ @extend .btn;
+ @extend .btn-default;
+ width: 100%;
+ }
+
+ table.invoice-element-legend {
+ min-width: 15em;
+ }
+
+ .invoice-element-legend tr, .invoice-element-legend th, .invoice-element-legend td {
+ border: 1px solid;
+ padding: 4px;
+ }
+
+ .bottom-notes {
+ font-style: italic;
+ }
+
+ }
+
+}
+
+
+.partial-avoir-table tr {
+ float:left;
+
+ .input-col { min-width: 2em; }
+ .label-col { min-width: 18em; }
+ .amount-col { min-width: 6em; }
+}
+
+.partial-avoir-selected-item {
+ background-color: $yellow;
+ display: block;
+ position: relative;
+
+ &:after {
+ content:"Rembourser";
+ display:inline-block;
+ position: absolute;
+ right: 0.8em;
+ top: 1.8em;
+ color: $red;
+ width: 6.7em;
+ transform: rotate(-22.5deg);
+ overflow: visible;
+ font-weight: bold;
+ border: 1px solid;
+ padding: 0 4px;
+ border-radius: 5px;
+ font-size: small;
+ }
+}
\ No newline at end of file
diff --git a/app/assets/templates/admin/admins/new.html.erb b/app/assets/templates/admin/admins/new.html.erb
new file mode 100644
index 000000000..a53506394
--- /dev/null
+++ b/app/assets/templates/admin/admins/new.html.erb
@@ -0,0 +1,34 @@
+
+
+
+
+
+ {{ 'add_an_administrator' }}
+
+
+
+
+
+
diff --git a/app/assets/templates/admin/authentications/_form.html.erb b/app/assets/templates/admin/authentications/_form.html.erb
new file mode 100644
index 000000000..efe2dc71b
--- /dev/null
+++ b/app/assets/templates/admin/authentications/_form.html.erb
@@ -0,0 +1,30 @@
+
+
+
\ No newline at end of file
diff --git a/app/assets/templates/admin/authentications/_oauth2.html.erb b/app/assets/templates/admin/authentications/_oauth2.html.erb
new file mode 100644
index 000000000..50d0300e8
--- /dev/null
+++ b/app/assets/templates/admin/authentications/_oauth2.html.erb
@@ -0,0 +1,93 @@
+{{ 'define_the_fields_mapping' }}
+
+
+
\ No newline at end of file
diff --git a/app/assets/templates/admin/authentications/edit.html.erb b/app/assets/templates/admin/authentications/edit.html.erb
new file mode 100644
index 000000000..43e282f9d
--- /dev/null
+++ b/app/assets/templates/admin/authentications/edit.html.erb
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+ {{ 'provider' | translate }} {{provider.name}}
+
+
+
+
+
+
+
+
+
+
+
+
{{ 'add_a_new_authentication_provider' }}
+
+
+
+
+ {{ 'name' }}
+
+ {{ 'type' }}
+
+ {{ 'state' }}
+
+
+
+
+
+ {{ provider.name }}
+ {{ getType(provider.providable_type) }}
+ {{ getState(provider.status) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'add_a_new_authentication_provider' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'calendar_management' }}
+
+
+
+
+
+ {{ 'trainings' }} {{ 'machines' }}
+
+
+
+
+
+
+
diff --git a/app/assets/templates/admin/calendar/eventModal.html.erb b/app/assets/templates/admin/calendar/eventModal.html.erb
new file mode 100644
index 000000000..6cc3bda96
--- /dev/null
+++ b/app/assets/templates/admin/calendar/eventModal.html.erb
@@ -0,0 +1,65 @@
+
+
+
{{ 'you_can_define_a_training_on_that_slot' }}
+
+
+
+
+
+
{{ 'or_' }} {{ '_select_some_machines' | translate }}
+
+
+
+ (id {{machine.id}})
+
+
+
+
+
+
{{ 'adjust_the_opening_hours' }}
+
+
+
+
{{ 'to_time' }}
+
+
+
+
+
+
{{ 'restrict_this_slot_with_labels_(optional)' }}
+
+
+
- Les Stages et ateliers du Fab Lab
+ {{ 'fablab_courses_and_workshops' }}
@@ -24,43 +24,43 @@
- Tous les évènements
- Les évènements déjà passés
- Les évènements à venir
+ {{ 'all_events' }}
+ {{ 'passed_events' }}
+ {{ 'events_to_come' }}
- Titre
- Dates
+ {{ 'title' }}
+ {{ 'dates' }}
-
+
{{ event.title }}
- Du {{event.start_date | amDateFormat:'DD/MM/YYYY'}} au {{event.end_date | amDateFormat:'DD/MM/YYYY'}}
+ {{ 'from_DATE' | translate:{DATE:(event.start_date | amDateFormat:'LL')} }} {{ 'to_date' }} {{event.end_date | amDateFormat:'LL'}}
Toute la journée
+ {{ 'all_day' }}
- De {{event.start_date | date:'HH:mm'}}
- à
- {{event.end_date | date:'HH:mm'}}
+ {{ 'from_TIME' | translate:{TIME:(event.start_date | amDateFormat:'LT')} }}
+ {{ 'to_time' }}
+ {{event.end_date | amDateFormat:'LT'}}
-
-
+
+
+
- <%#
- %>
@@ -71,7 +71,7 @@
diff --git a/app/assets/templates/admin/events/reservations.html.erb b/app/assets/templates/admin/events/reservations.html.erb
new file mode 100644
index 000000000..f21bad55f
--- /dev/null
+++ b/app/assets/templates/admin/events/reservations.html.erb
@@ -0,0 +1,52 @@
+
+
+
+
+
+ {{ 'reservations' | translate }} {{event.title}}
+
+
+
+
+
+
+
+
+
+
+ {{ 'user' }}
+ {{ 'payment_date' }}
+ {{ 'reserved_tickets' }}
+
+
+
+
+
+ {{ reservation.user_full_name }}
+
+ {{ reservation.created_at | amDateFormat:'LL LTS' }}
+ {{ 'full_price_' | translate }} {{reservation.nb_reserve_places}} {{ 'reduced_rate_' | translate }} {{reservation.nb_reserve_reduced_places}}
+
+
+
+
+
+
+
+
+
{{ 'no_reservations_for_now' }}
+
+
{{ 'back_to_monitoring' }}
+
+
+
diff --git a/app/assets/templates/admin/groups/index.html.erb b/app/assets/templates/admin/groups/index.html.erb
new file mode 100644
index 000000000..498c29c1c
--- /dev/null
+++ b/app/assets/templates/admin/groups/index.html.erb
@@ -0,0 +1,37 @@
+{{ 'add_a_group' }}
+
+
+
+ {{ 'group_name' }}
+
+
+
+
+
+
+ {{group.name}}
+
+
+
+
+
+
+
+ {{ 'edit' }}
+
+
+
+
+
+
+
+
diff --git a/app/assets/templates/admin/invoices/avoirModal.html.erb b/app/assets/templates/admin/invoices/avoirModal.html.erb
new file mode 100644
index 000000000..56e72b16c
--- /dev/null
+++ b/app/assets/templates/admin/invoices/avoirModal.html.erb
@@ -0,0 +1,60 @@
+
+
+
\ No newline at end of file
diff --git a/app/assets/templates/admin/invoices/index.html.erb b/app/assets/templates/admin/invoices/index.html.erb
new file mode 100644
index 000000000..4c96d3789
--- /dev/null
+++ b/app/assets/templates/admin/invoices/index.html.erb
@@ -0,0 +1,383 @@
+
+
+
+
+
+
+
+
+
+
+
+
{{ 'no_invoices_for_now' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/assets/templates/admin/members/_form.html.erb b/app/assets/templates/admin/members/_form.html.erb
index 6de0a9c35..d7c1831d0 100644
--- a/app/assets/templates/admin/members/_form.html.erb
+++ b/app/assets/templates/admin/members/_form.html.erb
@@ -1,9 +1,61 @@
+
+
+
+
+
+
diff --git a/app/assets/templates/admin/members/edit.html.erb b/app/assets/templates/admin/members/edit.html.erb
index 3e26192af..92107c960 100644
--- a/app/assets/templates/admin/members/edit.html.erb
+++ b/app/assets/templates/admin/members/edit.html.erb
@@ -9,15 +9,15 @@
- Utilisateur : {{ user.name }}
+ {{ 'user' | translate }} {{ user.name }}
-
- Annuler
+
+ {{ 'cancel' }}
@@ -31,22 +31,191 @@
diff --git a/app/assets/templates/admin/members/index.html.erb b/app/assets/templates/admin/members/index.html.erb
index ed0a9e35e..3d0f6df69 100644
--- a/app/assets/templates/admin/members/index.html.erb
+++ b/app/assets/templates/admin/members/index.html.erb
@@ -7,7 +7,7 @@
- Liste des membres
+ {{ 'users_management' }}
@@ -16,56 +16,127 @@
-
-
-
-
Ajouter un nouveau membre
-
-
-
-
-
-
- Nom Prénom Email Tel. Type utilisateur
-
-
-
- {{ member.profile.last_name }}
- {{ member.profile.first_name }}
- {{ member.email }}
- {{ member.profile.phone }}
- {{ member.group.name }}
-
-
-
-
-
-
-
-
-
-
diff --git a/app/assets/templates/admin/members/new.html.erb b/app/assets/templates/admin/members/new.html.erb
index 9a141a64b..30c049de1 100644
--- a/app/assets/templates/admin/members/new.html.erb
+++ b/app/assets/templates/admin/members/new.html.erb
@@ -9,15 +9,15 @@
- Ajouter un membre
+ {{ 'add_a_member' }}
-
- Annuler
+
+ {{ 'cancel' }}
@@ -42,7 +42,7 @@
diff --git a/app/assets/templates/admin/plans/_form.html.erb b/app/assets/templates/admin/plans/_form.html.erb
new file mode 100644
index 000000000..03d38582d
--- /dev/null
+++ b/app/assets/templates/admin/plans/_form.html.erb
@@ -0,0 +1,158 @@
+
{{ 'general_informations' }}
+
+
+
+ {{ 'name' | translate }} *
+ {{ 'name_is_required' }}
+ {{ 'name_length_must_be_less_than_24_characters' }}
+
+
+ {{ 'type' | translate }} *
+
+ {{ 'standard' }}
+ {{ 'partner' }}
+
+ {{ 'type_is_required' }}
+
+
+ {{ 'group' | translate }} *
+
+ {{ 'transversal_(all_groups)' }}
+
+ {{group.name}}
+
+
+ {{ 'group_is_required' }}
+
+
+
+ {{ 'period' | translate }} *
+
+ {{ 'month' }}
+ {{ 'year' }}
+
+ {{ 'period_is_required' }}
+
+
+
+ {{ 'number_of_periods' | translate }} *
+ {{ 'number_of_periods_is_required' }}
+
+
+
+
+
+ {{ 'visual_prominence_of_the_subscription' }}
+
+ {{ 'on_the_subscriptions_page_the_most_prominent_subscriptions_will_be_placed_at_the_top_of_the_list' | translate }}
+ {{ 'an_evelated_number_means_a_higher_prominence' | translate }}
+
+
+
+
+ {{ 'rolling_subscription' | translate }} *
+ {{ (plan.is_rolling ? 'yes' : 'no') | translate }}
+
+ {{ 'a_rolling_subscription_will_begin_the_day_of_the_first_training' | translate }}
+ {{ 'otherwise_it_will_begin_as_soon_as_it_is_bought' | translate }}
+
+
+
+
+
+
+
+
{{ 'information_sheet' }}
+
+
+
+
+
+ Partenaire notifié
+
+
+
\ No newline at end of file
diff --git a/app/assets/templates/admin/plans/edit.html.erb b/app/assets/templates/admin/plans/edit.html.erb
new file mode 100644
index 000000000..5c9020129
--- /dev/null
+++ b/app/assets/templates/admin/plans/edit.html.erb
@@ -0,0 +1,69 @@
+
+
+
+
+
+ {{ 'subscription_plan' | translate }} {{ plan.base_name }}
+
+
+
+
+
+
+
+
+
diff --git a/app/assets/templates/admin/plans/new.html.erb b/app/assets/templates/admin/plans/new.html.erb
new file mode 100644
index 000000000..bd5621fb8
--- /dev/null
+++ b/app/assets/templates/admin/plans/new.html.erb
@@ -0,0 +1,33 @@
+
+
+
+
+
+ {{ 'add_a_subscription_plan' }}
+
+
+
+
+
+
diff --git a/app/assets/templates/admin/pricing/index.html.erb b/app/assets/templates/admin/pricing/index.html.erb
new file mode 100644
index 000000000..4a5ce4acf
--- /dev/null
+++ b/app/assets/templates/admin/pricing/index.html.erb
@@ -0,0 +1,219 @@
+
+
+
+
+
+ {{ 'pricing_management' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'list_of_the_subscription_plans' }}
+
+
+ {{ 'beware_the_subscriptions_are_disabled_on_this_application' | translate }}
+ {{ 'you_can_create_some_but_they_wont_be_available_until_the_project_is_redeployed_by_the_server_manager' | translate }}
+
+
+ {{ 'add_a_new_subscription_plan' }}
+
+
+
+
+
+
+
+
+ {{ 'trainings' }}
+
+ {{group.name}}
+
+
+
+
+
+
+ {{ training.name }}
+
+
+
+ {{ findTrainingsPricing(trainingsPricings, training.id, group.id).amount | currency}}
+
+
+
+
+
+
+
+
+
+ {{ 'these_prices_match_machine_hours_rates_' | translate }} {{ '_without_subscriptions' }} .
+
+
+
+
+ {{ 'machines' }}
+
+ {{group.name}}
+
+
+
+
+
+
+ {{ machine.name }}
+
+
+
+ {{ findPriceBy(machinesPrices, machine.id, group.id).amount | currency}}
+
+
+
+
+
+
+
+
+ {{ 'trainings' }}
+
+
+
+ {{ 'subscription' }}
+ {{ 'credits' }}
+ {{ 'related_trainings' }}
+
+
+
+
+
+
+ {{ plan | humanReadablePlanName: groups }}
+
+
+
+ {{ plan.training_credit_nb }}
+
+
+
+
+ {{ showTrainings(trainingIds) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'machines' }}
+
+ {{ 'add_a_machine_credit' }}
+
+
+
+
+
+ {{ 'machine' }}
+ {{ 'hours' }}
+ {{ 'related_subscriptions' }}
+
+
+
+
+
+
+ {{ showCreditableName(mc) }}
+
+
+
+
+ {{ mc.hours }}
+
+
+
+
+ {{ getPlanFromId(mc.plan_id) | humanReadablePlanName: groups: 'short' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/assets/templates/admin/project_elements/index.html.erb b/app/assets/templates/admin/project_elements/index.html.erb
index 3254f262f..b4264d2bc 100644
--- a/app/assets/templates/admin/project_elements/index.html.erb
+++ b/app/assets/templates/admin/project_elements/index.html.erb
@@ -7,7 +7,7 @@
- Gestion des éléments projets
+ {{ 'projects_elements_management' }}
@@ -19,14 +19,14 @@
-
-
- Ajouter un matériau
+
+
+ {{ 'add_a_material' }}
- Nom
+ {{ 'name' }}
@@ -49,7 +49,7 @@
- Éditer
+ {{ 'edit' }}
-
-
- Ajouter une nouvelle thématique
+
+
+ {{ 'add_a_new_theme' }}
- Nom
+ {{ 'name' }}
@@ -89,7 +89,7 @@
- Éditer
+ {{ 'edit' }}
-
-
- Ajouter une nouvelle licence
+
+
+ {{ 'add_a_new_licence' }}
- Nom
- Description
+ {{ 'name' }}
+ {{ 'description' }}
@@ -135,7 +135,7 @@
- Éditer
+ {{ 'edit' }}
-
-
+
+
diff --git a/app/assets/templates/admin/settings/index.html b/app/assets/templates/admin/settings/index.html
new file mode 100644
index 000000000..2fa5158c7
--- /dev/null
+++ b/app/assets/templates/admin/settings/index.html
@@ -0,0 +1,463 @@
+
+
+
+
+
+ {{ 'customize_the_application' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'customize_information_messages' }}
+
+
+
+
+
+
+
{{ 'message_of_the_machine_booking_page' }}
+
+
+
+
{{ 'save' }}
+
+
+
{{ 'warning_message_of_the_training_booking_page'}}
+
+
+
+
{{ 'save' }}
+
+
+
{{ 'information_message_of_the_training_reservation_page'}}
+
+
+
+
{{ 'save' }}
+
+
+
{{ 'message_of_the_subscriptions_page' }}
+
+
+
{{ 'save' }}
+
+
+
+
+
{{ 'message_of_the_event_page_relative_to_the_reduced_rate_availability_conditions' }}
+
+
+
{{ 'save' }}
+
+
+
+
+
+
+ {{ 'legal_documents'}}
+
+
+
+ {{ 'if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user' }}
+
+
+
+
+
+
+ {{ 'customize_the_graphics' }}
+
+
+
+ {{ 'for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height' }} {{ 'concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels' }} {{ 'remember_to_refresh_the_page_for_the_changes_to_take_effect' }}
+
+
+
+
+
{{ 'main_colour' }}
+
+
+
+
{{ 'secondary_colour' }}
+
+
+
+
+
+
+
+
+
+
+
+
{{ 'news_of_the_home_page' }}
+
+
+
{{ 'save' }}
+
+
+
{{ 'twitter_stream' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ 'save' }}
+
+
+
+
+
+
+
+
+
+
+
+
{{ 'save' }}
+
+
+
+
+
+
+
+
+
+ {{ 'reservations_parameters' }}
+
+
+
+
+
{{ 'confine_the_booking_agenda' }}
+
+
{{ 'opening_time' }}
+
+
+ {{ 'save' }}
+
+
+
{{ 'closing_time' }}
+
+
+ {{ 'save' }}
+
+
+
+
{{ 'ability_for_the_users_to_move_their_reservations' }}
+
+ {{ 'reservations_shifting' }}
+ {{ 'save' }}
+
+
+
+
+
{{ 'prior_period_(hours)' }}
+
+
{{ 'save' }}
+
+
+
+
{{ 'ability_for_the_users_to_cancel_their_reservations' }}
+
+ {{ 'reservations_cancelling' }}
+ {{ 'save' }}
+
+
+
+
+
{{ 'prior_period_(hours)' }}
+
+
{{ 'save' }}
+
+
+
+
+
+
+
+
+
diff --git a/app/assets/templates/admin/statistics/graphs.html.erb b/app/assets/templates/admin/statistics/graphs.html.erb
new file mode 100644
index 000000000..6095fab90
--- /dev/null
+++ b/app/assets/templates/admin/statistics/graphs.html.erb
@@ -0,0 +1,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ 'top_list_of' | translate}} {{stat.label}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/assets/templates/admin/statistics/index.html.erb b/app/assets/templates/admin/statistics/index.html.erb
new file mode 100644
index 000000000..82743039a
--- /dev/null
+++ b/app/assets/templates/admin/statistics/index.html.erb
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'entries' | translate }} {{data.length}}
+ {{ 'revenue_' | translate }} {{sumCA | currency}}
+ {{ 'average_age' | translate }} {{averageAge}} {{ 'years_old' | translate }}
+ {{ 'total' | translate }} {{type.active.label}} : {{sumStat}}
+
+
+
+
+ {{ 'date' }}
+ {{ 'user' }}
+ {{ 'gender' }}
+ {{ 'age' }}
+ {{ 'type' }}
+ {{type.active.label}}
+ {{field.label}}
+ {{ 'revenue' | translate }}
+
+
+
+
+
+
+
+
+
+ {{formatDate(datum._source.date)}}
+ {{getUserNameFromId(datum._source.userId)}} {{formatSex(datum._source.gender)}}
+ {{datum._source.age}} {{ 'years_old' | translate }} {{ 'unknown' }} {{formatSubtype(datum._source.subType)}}
+ {{datum._source.stat}}
+
+
+ {{formatDate(datum._source[field.key])}}
+
+ {{datum._source[field.key]}}
+
+
+ {{datum._source.ca | currency}} {{ 'unknown' }}
+
+
+
+
+
+
+
+
diff --git a/app/assets/templates/admin/subscriptions/create_modal.html.erb b/app/assets/templates/admin/subscriptions/create_modal.html.erb
new file mode 100644
index 000000000..7ff44ecdc
--- /dev/null
+++ b/app/assets/templates/admin/subscriptions/create_modal.html.erb
@@ -0,0 +1,20 @@
+
+
+
+
+ {{ 'you_are_about_to_purchase_a_subscription_to_NAME' }}
+
+
+
+
+
+
+ {{ 'you_intentionally_decide_to_extend_the_user_s_subscription_by_offering_him_free_days' }}
+
+
+ {{ 'you_intentionally_decide_to_extend_the_user_s_subscription_by_charging_him_again_for_his_current_subscription' }}
+
+
+
+
{{ 'add_a_tag'}}
+
+
+
+ {{ 'tag_name' }}
+
+
+
+
+
+
+ {{tag.name}}
+
+
+
+
+
+
+
+ {{ 'edit' }}
+
+
+
+
+
+
+
+
diff --git a/app/assets/templates/admin/trainings/index.html.erb b/app/assets/templates/admin/trainings/index.html.erb
new file mode 100644
index 000000000..0b218b814
--- /dev/null
+++ b/app/assets/templates/admin/trainings/index.html.erb
@@ -0,0 +1,124 @@
+
+
+
+
+
+ {{ 'trainings_monitoring' }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'add_a_new_training' }}
+
+ {{ 'beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero' | translate }}
+ {{ 'dont_forget_to_change_them_before_creating_slots_for_this_training' | translate }}
+
+
+
+
+
+ {{ 'name' }}
+ {{ 'associated_machines' }}
+ {{ 'number_of_tickets' }}
+
+
+
+
+
+
+ {{ training.name }}
+
+
+
+
+ {{ showMachines(training) }}
+
+
+
+
+ {{ training.nb_total_places }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'training' }}
+ {{ 'date' }}
+
+
+
+
+ {{training_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/assets/templates/admin/trainings/modal_edit.html.erb b/app/assets/templates/admin/trainings/modal_edit.html.erb
new file mode 100644
index 000000000..2c51871fa
--- /dev/null
+++ b/app/assets/templates/admin/trainings/modal_edit.html.erb
@@ -0,0 +1,14 @@
+
+
+
diff --git a/app/assets/templates/admin/trainings/validTrainingModal.html.erb b/app/assets/templates/admin/trainings/validTrainingModal.html.erb
new file mode 100644
index 000000000..99608fef3
--- /dev/null
+++ b/app/assets/templates/admin/trainings/validTrainingModal.html.erb
@@ -0,0 +1,18 @@
+
+
+
{{ 'training_of_the_' | translate }}{{ availability.start_at | amDateFormat:'LLL' }} - {{ availability.end_at | amDateFormat:'LT' }}
+
+
{{ 'no_reservation' }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 'reference_number' }}
+ {{ 'date' }}
+ {{ 'price' }}
+
+
+
+
+ {{ invoice.reference }}
+ {{ invoice.date | amDateFormat:'L LTS' }}
+ {{ invoice.date | amDateFormat:'L' }}
+ {{ invoice.total | currency}}
+
+
+
+
+
+
+
{{ 'no_invoices_for_now' }}
+
+
+
+
-
+
- Tableau de bord
+ {{ 'dashboard' }}
-
-
diff --git a/app/assets/templates/dashboard/profile.html.erb b/app/assets/templates/dashboard/profile.html.erb
index b22152862..ed3b13fd1 100644
--- a/app/assets/templates/dashboard/profile.html.erb
+++ b/app/assets/templates/dashboard/profile.html.erb
@@ -13,19 +13,67 @@
{{user.name}}
{{user.email}}
- Dernière activité le {{user.last_sign_in_at | amDateFormat: 'Do MMMM '}}
+ {{ 'last_activity_on_' | translate }} {{user.last_sign_in_at | amDateFormat: 'LL'}}
-
+
+
+
{{ 'group' }}
+
+
+ {{getUserGroup().name}}
+
+ {{ 'i_want_to_change_group' }}
+
+
+ Changer mon groupe
+
+
+
+
{{ 'subscription' }}
+
+
+ {{ user.subscribed_plan | humanReadablePlanName }}
+ {{ 'your_subscription_expires_on_' | translate }} {{user.subscription.expired_at | amDateFormat: 'LL'}}
+
+
+
+
+
-
Projets
+
{{ 'trainings' }}
+
+
+ {{r.reservable.name}} - {{ 'to_come' | translate }}
+
+
+ {{t.name}} - {{ 'approved' | translate }}
+
+
+
{{ 'no_trainings' }}
+
+
+
+
{{ 'projects' }}
-
Aucun projet
+
{{ 'no_projects' }}
+
+
+
{{ 'labels' }}
+
+ {{t.name}}
+
+
{{ 'no_labels' }}
+
+
+
+