rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-21 15:54:22 +01:00
Code Issues Releases Activity

fixed & improved js routing

Browse Source
This commit is contained in:
Sylvain 2017-02-21 15:41:45 +01:00
parent 3837604dd6
commit 5a41424579
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/controllers/machines.coffee.erb
View File

@ -93,7 +93,7 @@ _reserveMachine = (machine, e) ->
# if the currently logged'in user has completed the training for this machine, or this machine does not require # 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 # a prior training, just redirect him to the machine's booking page
if machine.current_user_is_training or machine.trainings.length == 0 if machine.current_user_is_training or machine.trainings.length == 0
_this.$state.go('app.logged.machines_reserve', {id: machine.id}) _this.$state.go('app.logged.machines_reserve', {id: machine.slug})
else else
# otherwise, if a user is authenticated ... # otherwise, if a user is authenticated ...
if _this.$scope.isAuthenticated() if _this.$scope.isAuthenticated()
@ -387,7 +387,7 @@ Application.Controllers.controller "ReserveMachineController", ["$scope", "$stat
slot.id = null slot.id = null
slot.is_reserved = false slot.is_reserved = false
slot.can_modify = false slot.can_modify = false
refetchCalendar() updateCalendar()
$scope.markSlotAsModifying = -> $scope.markSlotAsModifying = ->
$scope.selectedEvent.backgroundColor = '#eee' $scope.selectedEvent.backgroundColor = '#eee'

4
app/assets/javascripts/directives/cart.coffee.erb
View File

@ -65,8 +65,10 @@ Application.Directives.directive 'cart', [ '$rootScope', '$uibModal', 'dialogs',
# and decrement the total amount of the cart if needed. # and decrement the total amount of the cart if needed.
# @param machineSlot {Object} fullCalendar event object # @param machineSlot {Object} fullCalendar event object
# @param index {number} index of the slot in the reservation array # @param index {number} index of the slot in the reservation array
# @param [event] {Object} see https://docs.angularjs.org/guide/expression#-event-
## ##
$scope.removeMachineSlot = (machineSlot, index)-> $scope.removeMachineSlot = (machineSlot, index, event)->
event.preventDefault() if event
$scope.events.reserved.splice(index, 1) $scope.events.reserved.splice(index, 1)
# if is was the last slot, we remove any plan from the cart # if is was the last slot, we remove any plan from the cart
if $scope.events.reserved.length == 0 if $scope.events.reserved.length == 0

2
app/assets/templates/shared/_cart.html.erb
View File

@ -33,7 +33,7 @@
<button class="btn btn-valid btn-warning btn-block text-u-c r-b" ng-click="validateSlot(machineSlot)" ng-if="!machineSlot.isValid" translate>{{ 'confirm_this_slot' }}</button> <button class="btn btn-valid btn-warning btn-block text-u-c r-b" ng-click="validateSlot(machineSlot)" ng-if="!machineSlot.isValid" translate>{{ 'confirm_this_slot' }}</button>
</div> </div>
<div class="clear"><a class="pull-right m-b-sm text-u-l ng-scope m-r-sm" href="#" ng-click="removeMachineSlot(machineSlot, $index)" ng-if="machineSlot.isValid" translate>{{ 'remove_this_slot' }}</a></div> <div class="clear"><a class="pull-right m-b-sm text-u-l ng-scope m-r-sm" href="#" ng-click="removeMachineSlot(machineSlot, $index, $event)" ng-if="machineSlot.isValid" translate>{{ 'remove_this_slot' }}</a></div>
</div> </div>
<coupon show="machineSlotsValid() && (!modePlans || selectedPlan)" coupon="coupon.applied" total="totalNoCoupon" user-id="{{user.id}}"></coupon> <coupon show="machineSlotsValid() && (!modePlans || selectedPlan)" coupon="coupon.applied" total="totalNoCoupon" user-id="{{user.id}}"></coupon>

2
app/controllers/api/availabilities_controller.rb
View File

@ -96,7 +96,7 @@ class API::AvailabilitiesController < API::ApiController
@user = current_user @user = current_user
end end
@current_user_role = current_user.is_admin? ? 'admin' : 'user' @current_user_role = current_user.is_admin? ? 'admin' : 'user'
@machine = Machine.find(params[:machine_id]) @machine = Machine.friendly.find(params[:machine_id])
@slots = [] @slots = []
@reservations = Reservation.where('reservable_type = ? and reservable_id = ?', @machine.class.to_s, @machine.id).includes(:slots, user: [:profile]).references(:slots, :user).where('slots.start_at > ?', Time.now) @reservations = Reservation.where('reservable_type = ? and reservable_id = ?', @machine.class.to_s, @machine.id).includes(:slots, user: [:profile]).references(:slots, :user).where('slots.start_at > ?', Time.now)
if @user.is_admin? if @user.is_admin?

2
app/views/api/machines/show.json.jbuilder
View File

@ -1,4 +1,4 @@
json.extract! @machine, :id, :name, :description, :spec, :created_at, :updated_at json.extract! @machine, :id, :name, :description, :spec, :created_at, :updated_at, :slug
json.machine_image @machine.machine_image.attachment.large.url if @machine.machine_image json.machine_image @machine.machine_image.attachment.large.url if @machine.machine_image
json.machine_files_attributes @machine.machine_files do |f| json.machine_files_attributes @machine.machine_files do |f|
json.id f.id json.id f.id