From 760109de058f4b6e8f7f8e8350b7263b9c99e1f7 Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Tue, 11 Feb 2020 13:21:25 +0100
Subject: [PATCH] fix bug: cant reserve formation slot

---
 app/assets/javascripts/controllers/spaces.js.erb     | 2 ++
 app/assets/javascripts/controllers/trainings.js.erb  | 2 ++
 app/assets/templates/spaces/reserve.html.erb         | 2 ++
 app/assets/templates/trainings/reserve.html.erb      | 2 ++
 app/views/api/availabilities/trainings.json.jbuilder | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/controllers/spaces.js.erb b/app/assets/javascripts/controllers/spaces.js.erb
index a60d0fce0..edf49d36d 100644
--- a/app/assets/javascripts/controllers/spaces.js.erb
+++ b/app/assets/javascripts/controllers/spaces.js.erb
@@ -243,6 +243,8 @@ Application.Controllers.controller('ReserveSpaceController', ['$scope', '$stateP
 
     // list of plans, classified by group
     $scope.plansClassifiedByGroup = [];
+    $scope.groups = groupsPromise;
+    $scope.plans = plansPromise;
     for (let group of Array.from(groupsPromise)) {
       const groupObj = { id: group.id, name: group.name, plans: [] };
       for (let plan of Array.from(plansPromise)) {
diff --git a/app/assets/javascripts/controllers/trainings.js.erb b/app/assets/javascripts/controllers/trainings.js.erb
index 22ed4e5dd..dfecc48af 100644
--- a/app/assets/javascripts/controllers/trainings.js.erb
+++ b/app/assets/javascripts/controllers/trainings.js.erb
@@ -111,6 +111,8 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta
     { member: {} };
 
     // list of plans, classified by group
+    $scope.groups = groupsPromise;
+    $scope.plans = plansPromise;
     $scope.plansClassifiedByGroup = [];
     for (let group of Array.from(groupsPromise)) {
       const groupObj = { id: group.id, name: group.name, plans: [] };
diff --git a/app/assets/templates/spaces/reserve.html.erb b/app/assets/templates/spaces/reserve.html.erb
index 145c74a5c..81a57c380 100644
--- a/app/assets/templates/spaces/reserve.html.erb
+++ b/app/assets/templates/spaces/reserve.html.erb
@@ -35,6 +35,8 @@
           plan="selectedPlan"
           plan-selection-time="planSelectionTime"
           settings="settings"
+          plans="plans"
+          groups="groups"
           on-slot-added-to-cart="markSlotAsAdded"
           on-slot-removed-from-cart="markSlotAsRemoved"
           on-slot-start-to-modify="markSlotAsModifying"
diff --git a/app/assets/templates/trainings/reserve.html.erb b/app/assets/templates/trainings/reserve.html.erb
index 4d1994bba..c30037fa3 100644
--- a/app/assets/templates/trainings/reserve.html.erb
+++ b/app/assets/templates/trainings/reserve.html.erb
@@ -47,6 +47,8 @@
           plan="selectedPlan"
           plan-selection-time="planSelectionTime"
           settings="settings"
+          plans="plans"
+          groups="groups"
           on-slot-added-to-cart="markSlotAsAdded"
           on-slot-removed-from-cart="markSlotAsRemoved"
           on-slot-start-to-modify="markSlotAsModifying"
diff --git a/app/views/api/availabilities/trainings.json.jbuilder b/app/views/api/availabilities/trainings.json.jbuilder
index 36782c8fb..42bcd2b35 100644
--- a/app/views/api/availabilities/trainings.json.jbuilder
+++ b/app/views/api/availabilities/trainings.json.jbuilder
@@ -33,5 +33,5 @@ json.array!(@availabilities) do |a|
     json.id t.id
     json.name t.name
   end
-  json.plan_ids slot.availability.plan_ids
+  json.plan_ids a.plan_ids
 end