diff --git a/app/assets/javascripts/reservation.js b/app/assets/javascripts/reservation.js new file mode 100644 index 00000000..255f3253 --- /dev/null +++ b/app/assets/javascripts/reservation.js @@ -0,0 +1,3 @@ +$(function(){ + +}); \ No newline at end of file diff --git a/app/assets/stylesheets/reservation.scss b/app/assets/stylesheets/reservation.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb index b9910803..4d53cc15 100644 --- a/app/controllers/origami/dashboard_controller.rb +++ b/app/controllers/origami/dashboard_controller.rb @@ -80,6 +80,17 @@ class Origami::DashboardController < BaseOrigamiController end end end + + #reservation + reservation = Lookup.collection_of('reservation') + @reservation = 0 + if !reservation.empty? + reservation.each do |reserve| + if reserve[0] == 'Reservation' + @reservation = reserve[1] + end + end + end end def get_all_menu diff --git a/app/controllers/origami/reservation_controller.rb b/app/controllers/origami/reservation_controller.rb new file mode 100644 index 00000000..6b1e3aa5 --- /dev/null +++ b/app/controllers/origami/reservation_controller.rb @@ -0,0 +1,6 @@ +class Origami::ReservationController < BaseOrigamiController + + def index + + end +end diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index 25c64303..92b34074 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -22,7 +22,7 @@