From 0bd7c1db01017d1d2f006ed007a4124ac501c4ed Mon Sep 17 00:00:00 2001
From: Wahib Kapdi <wahibkapdi@tamu.edu>
Date: Wed, 30 Oct 2024 21:20:30 -0500
Subject: [PATCH 01/13] Time Slots Fixed

---
 app/models/time_slot.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/time_slot.rb b/app/models/time_slot.rb
index f1b1c0b..4d392bf 100644
--- a/app/models/time_slot.rb
+++ b/app/models/time_slot.rb
@@ -13,7 +13,7 @@ class TimeSlot < ApplicationRecord
   private
 
   def end_time_after_start_time
-    return unless end_time.present? && start_time.present? && end_time <= start_time
+    return unless end_time.present? && start_time.present? && Time.parse(end_time) <= Time.parse(start_time)
 
     errors.add(:end_time, 'must be after the start time')
   end

From 8fe6339bddb90028e1b9b70d7291144cdb9db03b Mon Sep 17 00:00:00 2001
From: Navya N <navyan@Navyas-MacBook-Pro-2.local>
Date: Wed, 30 Oct 2024 22:39:40 -0500
Subject: [PATCH 02/13] instructor foreign key

---
 ...936_add_instructor_ref_to_room_bookings.rb |   5 +
 db/schema.rb                                  | 199 ++++++++++--------
 2 files changed, 111 insertions(+), 93 deletions(-)
 create mode 100644 db/migrate/20241031023936_add_instructor_ref_to_room_bookings.rb

diff --git a/db/migrate/20241031023936_add_instructor_ref_to_room_bookings.rb b/db/migrate/20241031023936_add_instructor_ref_to_room_bookings.rb
new file mode 100644
index 0000000..2ea15fd
--- /dev/null
+++ b/db/migrate/20241031023936_add_instructor_ref_to_room_bookings.rb
@@ -0,0 +1,5 @@
+class AddInstructorRefToRoomBookings < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :room_bookings, :instructor, null: false, foreign_key: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 19dfe95..8774af9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -12,113 +10,128 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 20_241_029_040_851) do
-  create_table 'courses', force: :cascade do |t|
-    t.string 'course_number'
-    t.integer 'max_seats'
-    t.string 'lecture_type'
-    t.integer 'num_labs'
-    t.integer 'schedule_id', null: false
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
-    t.index ['schedule_id'], name: 'index_courses_on_schedule_id'
+ActiveRecord::Schema[7.2].define(version: 2024_10_31_023936) do
+  create_table "courses", force: :cascade do |t|
+    t.string "course_number"
+    t.integer "max_seats"
+    t.string "lecture_type"
+    t.integer "num_labs"
+    t.integer "schedule_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["schedule_id"], name: "index_courses_on_schedule_id"
+  end
+
+  create_table "instructor_preferences", force: :cascade do |t|
+    t.integer "instructor_id", null: false
+    t.integer "preference_level"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "course_id", null: false
+    t.index ["course_id"], name: "index_instructor_preferences_on_course_id"
+    t.index ["instructor_id"], name: "index_instructor_preferences_on_instructor_id"
   end
 
-  create_table 'instructor_preferences', force: :cascade do |t|
-    t.integer 'instructor_id', null: false
-    t.integer 'preference_level'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
-    t.integer 'course_id', null: false
-    t.index ['course_id'], name: 'index_instructor_preferences_on_course_id'
-    t.index ['instructor_id'], name: 'index_instructor_preferences_on_instructor_id'
+  create_table "instructors", force: :cascade do |t|
+    t.integer "id_number"
+    t.string "last_name"
+    t.string "first_name"
+    t.string "middle_name"
+    t.string "email"
+    t.boolean "before_9"
+    t.boolean "after_3"
+    t.text "beaware_of"
+    t.integer "schedule_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "max_course_load"
+    t.index ["schedule_id"], name: "index_instructors_on_schedule_id"
   end
 
-  create_table 'instructors', force: :cascade do |t|
-    t.integer 'id_number'
-    t.string 'last_name'
-    t.string 'first_name'
-    t.string 'middle_name'
-    t.string 'email'
-    t.boolean 'before_9'
-    t.boolean 'after_3'
-    t.text 'beaware_of'
-    t.integer 'schedule_id'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
-    t.integer 'max_course_load'
-    t.index ['schedule_id'], name: 'index_instructors_on_schedule_id'
+  create_table "room_blocks", force: :cascade do |t|
+    t.integer "room_id", null: false
+    t.integer "time_slot_id", null: false
+    t.boolean "is_blocked", default: true
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["room_id"], name: "index_room_blocks_on_room_id"
+    t.index ["time_slot_id"], name: "index_room_blocks_on_time_slot_id"
   end
 
-  create_table 'room_bookings', force: :cascade do |t|
-    t.integer 'room_id', null: false
-    t.integer 'time_slot_id', null: false
-    t.boolean 'is_available'
-    t.boolean 'is_lab'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
-    t.index ['room_id'], name: 'index_room_bookings_on_room_id'
-    t.index ['time_slot_id'], name: 'index_room_bookings_on_time_slot_id'
+  create_table "room_bookings", force: :cascade do |t|
+    t.integer "room_id", null: false
+    t.integer "time_slot_id", null: false
+    t.boolean "is_available"
+    t.boolean "is_lab"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "instructor_id", null: false
+    t.index ["instructor_id"], name: "index_room_bookings_on_instructor_id"
+    t.index ["room_id"], name: "index_room_bookings_on_room_id"
+    t.index ["time_slot_id"], name: "index_room_bookings_on_time_slot_id"
   end
 
-  create_table 'rooms', force: :cascade do |t|
-    t.integer 'campus'
-    t.boolean 'is_lecture_hall'
-    t.boolean 'is_learning_studio'
-    t.boolean 'is_lab'
-    t.string 'building_code'
-    t.string 'room_number'
-    t.integer 'capacity'
-    t.boolean 'is_active'
-    t.string 'comments'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
-    t.integer 'schedule_id', default: -1, null: false
-    t.index ['schedule_id'], name: 'index_rooms_on_schedule_id'
+  create_table "rooms", force: :cascade do |t|
+    t.integer "campus"
+    t.boolean "is_lecture_hall"
+    t.boolean "is_learning_studio"
+    t.boolean "is_lab"
+    t.string "building_code"
+    t.string "room_number"
+    t.integer "capacity"
+    t.boolean "is_active"
+    t.string "comments"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "schedule_id", default: -1, null: false
+    t.index ["schedule_id"], name: "index_rooms_on_schedule_id"
   end
 
-  create_table 'schedules', force: :cascade do |t|
-    t.string 'schedule_name'
-    t.string 'semester_name'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "schedules", force: :cascade do |t|
+    t.string "schedule_name"
+    t.string "semester_name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table 'sections', force: :cascade do |t|
-    t.string 'section_number'
-    t.integer 'seats_alloted'
-    t.integer 'course_id', null: false
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
-    t.index ['course_id'], name: 'index_sections_on_course_id'
+  create_table "sections", force: :cascade do |t|
+    t.string "section_number"
+    t.integer "seats_alloted"
+    t.integer "course_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["course_id"], name: "index_sections_on_course_id"
   end
 
-  create_table 'time_slots', force: :cascade do |t|
-    t.string 'day'
-    t.string 'start_time'
-    t.string 'end_time'
-    t.string 'slot_type'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
+  create_table "time_slots", force: :cascade do |t|
+    t.string "day"
+    t.string "start_time"
+    t.string "end_time"
+    t.string "slot_type"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table 'users', force: :cascade do |t|
-    t.string 'email'
-    t.string 'first_name'
-    t.string 'last_name'
-    t.datetime 'created_at', null: false
-    t.datetime 'updated_at', null: false
-    t.string 'uid'
-    t.string 'provider'
-    t.index ['email'], name: 'index_users_on_email', unique: true
+  create_table "users", force: :cascade do |t|
+    t.string "email"
+    t.string "first_name"
+    t.string "last_name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "uid"
+    t.string "provider"
+    t.index ["email"], name: "index_users_on_email", unique: true
   end
 
-  add_foreign_key 'courses', 'schedules'
-  add_foreign_key 'instructor_preferences', 'courses'
-  add_foreign_key 'instructor_preferences', 'instructors'
-  add_foreign_key 'instructors', 'schedules'
-  add_foreign_key 'room_bookings', 'rooms'
-  add_foreign_key 'room_bookings', 'time_slots'
-  add_foreign_key 'rooms', 'schedules'
-  add_foreign_key 'sections', 'courses'
+  add_foreign_key "courses", "schedules"
+  add_foreign_key "instructor_preferences", "courses"
+  add_foreign_key "instructor_preferences", "instructors"
+  add_foreign_key "instructors", "schedules"
+  add_foreign_key "room_blocks", "rooms"
+  add_foreign_key "room_blocks", "time_slots"
+  add_foreign_key "room_bookings", "instructors"
+  add_foreign_key "room_bookings", "rooms"
+  add_foreign_key "room_bookings", "time_slots"
+  add_foreign_key "rooms", "schedules"
+  add_foreign_key "sections", "courses"
 end

From 70afc33b83c46388802d0396405bc0e218b66440 Mon Sep 17 00:00:00 2001
From: Navya N <navyan@Navyas-MacBook-Pro-2.local>
Date: Wed, 30 Oct 2024 23:18:32 -0500
Subject: [PATCH 03/13] post for room bookings

---
 app/controllers/room_bookings_controller.rb | 17 +++++++++++++++++
 config/routes.rb                            |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/app/controllers/room_bookings_controller.rb b/app/controllers/room_bookings_controller.rb
index 533c36f..8813f32 100644
--- a/app/controllers/room_bookings_controller.rb
+++ b/app/controllers/room_bookings_controller.rb
@@ -20,4 +20,21 @@ def index
       hash[[booking.room_id, booking.time_slot_id]] = booking
     end
   end
+
+
+  def create
+    room_booking = RoomBooking.new(room_booking_params)
+
+    if room_booking.save
+      render json: { message: 'Room booking created successfully', room_booking: room_booking }, status: :created
+    else
+      render json: { error: 'Failed to create room booking', details: room_booking.errors.full_messages }, status: :unprocessable_entity
+    end
+  end
+
+  private
+
+  def room_booking_params
+    params.require(:room_booking).permit(:room_id, :time_slot_id, :is_available, :is_lab, :instructor_id)
+  end
 end
diff --git a/config/routes.rb b/config/routes.rb
index c5aa2a4..16bda4d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -45,4 +45,6 @@
 
   # Show Time Slot View
   resources :time_slots, only: [:index]
+
+  resources :room_bookings, only: [:create]
 end

From c791a0f8fc3ac1d7ae86774c2ea67db707e3ac19 Mon Sep 17 00:00:00 2001
From: Wahib Kapdi <wahibkapdi@tamu.edu>
Date: Thu, 31 Oct 2024 07:23:12 -0500
Subject: [PATCH 04/13] Added slot selection and course list addition

---
 app/controllers/courses_controller.rb    |  11 +++
 app/views/courses/_courses_list.html.erb |  15 +++
 app/views/layouts/application.html.erb   |   2 +-
 app/views/room_bookings/index.html.erb   | 120 +++++++++++++++--------
 config/routes.rb                         |   2 +
 5 files changed, 107 insertions(+), 43 deletions(-)
 create mode 100644 app/views/courses/_courses_list.html.erb

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 70b91ea..76a7a7f 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -11,6 +11,17 @@ def index
     @courses = @courses.order("#{sort_column} #{direction}")
   end
 
+  def fetch_courses
+    room_id = params[:room_id]
+    time_slot_id = params[:time_slot_id]
+
+    @schedule = Schedule.find(params[:schedule_id])
+    @courses = @schedule.courses
+    @sections = Section.joins(:course)
+
+    render json: { html: render_to_string(partial: "courses_list", locals: { sections: @sections }) }
+  end
+
   private
 
   # Define the allowed sorting columns
diff --git a/app/views/courses/_courses_list.html.erb b/app/views/courses/_courses_list.html.erb
new file mode 100644
index 0000000..f47615f
--- /dev/null
+++ b/app/views/courses/_courses_list.html.erb
@@ -0,0 +1,15 @@
+<% if sections.present? %>
+    <div class="mt-3">
+        <% sections.each do |section| %>
+            <div class="list-group-item list-group-item-action justify-content-between align-items-center bg-light border rounded-3 mb-2 p-2">
+                <div class="d-flex row w-12">
+                    <strong class="mb-1"><%= section.course.course_number %>(<%= section.section_number %>)</strong>
+                    <small class="text-muted">Seats: <%= section.seats_alloted %></small>
+                </div>
+                <div class="badge bg-info-subtle text-dark rounded">Type: <%= section.course.lecture_type %></div>
+            </div>
+        <% end %>
+    </div>
+<% else %>
+    <p>No courses available for the selected room and time slot.</p>
+<% end %>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7a2490c..f03c124 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,7 +14,7 @@
     <link rel="icon" href="/icon.svg" type="image/svg+xml">
     <link rel="apple-touch-icon" href="/icon.png">
 
-    <%= stylesheet_link_tag "https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css", integrity: "sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65", crossorigin: "anonymous" %>
+    <%= stylesheet_link_tag "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css", integrity: "sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH", crossorigin: "anonymous" %>
     <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
     <%= javascript_importmap_tags %>
     <%= javascript_include_tag 'room_bookings' %>
diff --git a/app/views/room_bookings/index.html.erb b/app/views/room_bookings/index.html.erb
index 7b7b254..ebf55af 100644
--- a/app/views/room_bookings/index.html.erb
+++ b/app/views/room_bookings/index.html.erb
@@ -16,49 +16,85 @@
     </div>
 </div>
 <% if !@rooms.empty? %>
-<nav class="navbar navbar-expand-sm navbar-light border-bottom border-2 border-dark px-4 pb-0 fw-bold">
-  <div class="collapse navbar-collapse" id="scheduleNavbar">
-    <ul class="navbar-nav">
-        <% @tabs.each do |tab| %>
-            <li id="<%= tab %>" class="nav-item">
-                <a class="nav-link <%= "active" if @active_tab == tab %>" href="<%= (@active_tab == tab && "#") || schedule_room_bookings_path(@schedule, active_tab: tab) %>"><%= tab %></a>
-            </li>
-        <% end %>
-    </ul>
-  </div>
-</nav>
-<div class="w-12">
-    <table class="table table-bordered table-hover grid-view-matrix">
-        <thead class="table-secondary">
-            <tr>
-            <th>Times \ Rooms</th>
-            <% @rooms.each do |room| %>
-                <th scope="col" ><%= room.building_code %> <%= room.room_number %></th>
-                
-            <% end %>
-            </tr>
-        </thead>
-        <tbody>
-            <% @time_slots.each do |time_slot| %>
-            <tr>
-                <th scope="row" class="table-secondary"><%= time_slot.start_time %> - <%= time_slot.end_time %></th>
-                
-                <% @rooms.each do |room| %>
-                <% booking = @bookings_matrix[[room.id, time_slot.id]] %>
-                
-                <td>
-                    <% if booking %>
-                    <%= booking.is_available ? 'Available' : 'Booked' %> |
-                    <%= booking.is_lab ? 'Lab' : 'Lecture' %>
-                    <% else %>
-                    <% end %>
-                </td>
+<div class="row">
+    <div class="col-10">
+        <nav class="navbar navbar-expand-sm navbar-light border-bottom border-2 border-dark px-4 pb-0 fw-bold">
+        <div class="collapse navbar-collapse" id="scheduleNavbar">
+            <ul class="navbar-nav">
+                <% @tabs.each do |tab| %>
+                    <li id="<%= tab %>" class="nav-item">
+                        <a class="nav-link <%= "active" if @active_tab == tab %>" href="<%= (@active_tab == tab && "#") || schedule_room_bookings_path(@schedule, active_tab: tab) %>"><%= tab %></a>
+                    </li>
                 <% end %>
-            </tr>
-            <% end %>
-        </tbody>
-    </table>
+            </ul>
+        </div>
+        </nav>
+        <div class="w-12">
+            <table class="table table-bordered table-hover grid-view-matrix">
+                <thead class="table-secondary">
+                    <tr>
+                    <th>Times \ Rooms</th>
+                    <% @rooms.each do |room| %>
+                        <th scope="col" ><%= room.building_code %> <%= room.room_number %></th>
+                        
+                    <% end %>
+                    </tr>
+                </thead>
+                <tbody>
+                    <% @time_slots.each do |time_slot| %>
+                    <tr>
+                        <th scope="row" class="table-secondary"><%= time_slot.start_time %> - <%= time_slot.end_time %></th>
+                        
+                        <% @rooms.each do |room| %>
+                        <% booking = @bookings_matrix[[room.id, time_slot.id]] %>
+                        
+                        <td class="table-cell" data-room-id="<%= room.id %>" data-time-slot-id="<%= time_slot.id %>">
+                            <% if booking %>
+                            <%= booking.is_available ? 'Available' : 'Booked' %> |
+                            <%= booking.is_lab ? 'Lab' : 'Lecture' %>
+                            <% else %>
+                            <% end %>
+                        </td>
+                        <% end %>
+                    </tr>
+                    <% end %>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div id="courses-list" class="col-2 bg-secondary-subtle vh-100 overflow-auto p-3">
+    </div>
 </div>
 <% else %>
     <p class="container h1 text-secondary">No rooms added to this schedule, click on View Data to Add Rooms!</p>
-<% end %>
\ No newline at end of file
+<% end %>
+<script>
+  document.addEventListener("DOMContentLoaded", () => {
+    document.querySelectorAll(".table-cell").forEach(cell => {
+      cell.addEventListener("click", function() {
+        const roomId = this.dataset.roomId;
+        const timeSlotId = this.dataset.timeSlotId;
+
+        fetch("courses/fetch_courses", {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            "X-CSRF-Token": "<%= form_authenticity_token %>"
+          },
+          body: JSON.stringify({ room_id: roomId, time_slot_id: timeSlotId })
+        })
+        .then(response => response.json())
+        .then(data => {
+          document.getElementById("courses-list").innerHTML = data.html;
+          document.querySelectorAll('td.table-cell').forEach(cell => {
+                if (cell.dataset.roomId === roomId && cell.dataset.timeSlotId === timeSlotId) {
+                    cell.classList.add('bg-warning-subtle');
+                } else {
+                    cell.classList.remove('bg-warning-subtle');
+                }
+            });
+        });
+      });
+    });
+  });
+</script>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index c5aa2a4..985d7f5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -40,6 +40,8 @@
     post 'time_slots', to: 'time_slots#filter', as: 'filter_time_slots'
 
     get '/time_slots', to: 'time_slots#index'
+    post '/courses/fetch_courses', to: 'courses#fetch_courses'
+
     resources :room_bookings, only: [:index]
   end
 

From 8eaff119d7d4e38f0bea407bc261b895fc526805 Mon Sep 17 00:00:00 2001
From: Wahib Kapdi <wahibkapdi@tamu.edu>
Date: Thu, 31 Oct 2024 09:42:55 -0500
Subject: [PATCH 05/13] Added Correct Hovering

---
 app/assets/stylesheets/room_bookings.css |  7 +++++
 app/views/courses/_courses_list.html.erb | 35 ++++++++++++++++++++++--
 app/views/room_bookings/index.html.erb   | 30 ++++++++++----------
 db/schema.rb                             | 12 --------
 4 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/app/assets/stylesheets/room_bookings.css b/app/assets/stylesheets/room_bookings.css
index e2d9e95..af6fcdd 100644
--- a/app/assets/stylesheets/room_bookings.css
+++ b/app/assets/stylesheets/room_bookings.css
@@ -1,4 +1,11 @@
 .is-hover {
     --bs-bg-opacity: 0.1;
     background-color: rgba(var(--bs-black-rgb), var(--bs-bg-opacity)) !important;
+}
+
+.section-item:hover {
+    background-color: #f0f9ff; /* Light blue shade to indicate hover */
+    transition: background-color 0.3s;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); /* Subtle shadow effect */
+    cursor: pointer;
 }
\ No newline at end of file
diff --git a/app/views/courses/_courses_list.html.erb b/app/views/courses/_courses_list.html.erb
index f47615f..3d0919a 100644
--- a/app/views/courses/_courses_list.html.erb
+++ b/app/views/courses/_courses_list.html.erb
@@ -1,7 +1,10 @@
 <% if sections.present? %>
     <div class="mt-3">
         <% sections.each do |section| %>
-            <div class="list-group-item list-group-item-action justify-content-between align-items-center bg-light border rounded-3 mb-2 p-2">
+            <div class="section-item list-group-item list-group-item-action justify-content-between align-items-center bg-light border rounded-3 mb-2 p-2"
+                data-room-id="<%= params[:room_id] %>"
+                data-time-slot-id="<%= params[:time_slot_id] %>"
+                data-section-id="<%= section.id %>">
                 <div class="d-flex row w-12">
                     <strong class="mb-1"><%= section.course.course_number %>(<%= section.section_number %>)</strong>
                     <small class="text-muted">Seats: <%= section.seats_alloted %></small>
@@ -12,4 +15,32 @@
     </div>
 <% else %>
     <p>No courses available for the selected room and time slot.</p>
-<% end %>
\ No newline at end of file
+<% end %>
+<script language="javascript" type="text/javascript">
+  document.addEventListener("DOMContentLoaded", () => {
+    document.querySelectorAll(".section-item").forEach(item => {
+      item.addEventListener("click", function() {
+        const roomId = this.dataset.roomId;
+        const timeSlotId = this.dataset.timeSlotId;
+        const sectionId = this.dataset.sectionId;
+
+        fetch("/room_bookings", {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            "X-CSRF-Token": "<%= form_authenticity_token %>"
+          },
+          body: JSON.stringify({ room_id: roomId, time_slot_id: timeSlotId, section_id: sectionId })
+        })
+        .then(response => response.json())
+        .then(data => {
+          if (data.success) {
+            alert(data.message);
+          } else {
+            alert("Failed to create room booking.");
+          }
+        });
+      });
+    });
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/room_bookings/index.html.erb b/app/views/room_bookings/index.html.erb
index ebf55af..c0adcc1 100644
--- a/app/views/room_bookings/index.html.erb
+++ b/app/views/room_bookings/index.html.erb
@@ -19,21 +19,21 @@
 <div class="row">
     <div class="col-10">
         <nav class="navbar navbar-expand-sm navbar-light border-bottom border-2 border-dark px-4 pb-0 fw-bold">
-        <div class="collapse navbar-collapse" id="scheduleNavbar">
-            <ul class="navbar-nav">
-                <% @tabs.each do |tab| %>
-                    <li id="<%= tab %>" class="nav-item">
-                        <a class="nav-link <%= "active" if @active_tab == tab %>" href="<%= (@active_tab == tab && "#") || schedule_room_bookings_path(@schedule, active_tab: tab) %>"><%= tab %></a>
-                    </li>
-                <% end %>
-            </ul>
-        </div>
+            <div class="collapse navbar-collapse" id="scheduleNavbar">
+                <ul class="navbar-nav">
+                    <% @tabs.each do |tab| %>
+                        <li id="<%= tab %>" class="nav-item">
+                            <a class="nav-link <%= "active" if @active_tab == tab %>" href="<%= (@active_tab == tab && "#") || schedule_room_bookings_path(@schedule, active_tab: tab) %>"><%= tab %></a>
+                        </li>
+                    <% end %>
+                </ul>
+            </div>
         </nav>
         <div class="w-12">
-            <table class="table table-bordered table-hover grid-view-matrix">
+            <table class="table table-bordered table-hover grid-view-matrix border-black">
                 <thead class="table-secondary">
                     <tr>
-                    <th>Times \ Rooms</th>
+                    <th>24 hr</th>
                     <% @rooms.each do |room| %>
                         <th scope="col" ><%= room.building_code %> <%= room.room_number %></th>
                         
@@ -48,7 +48,7 @@
                         <% @rooms.each do |room| %>
                         <% booking = @bookings_matrix[[room.id, time_slot.id]] %>
                         
-                        <td class="table-cell" data-room-id="<%= room.id %>" data-time-slot-id="<%= time_slot.id %>">
+                        <td class="table-cell <%= "bg-primary-subtle" if room.is_lab? %>" data-room-id="<%= room.id %>" data-time-slot-id="<%= time_slot.id %>">
                             <% if booking %>
                             <%= booking.is_available ? 'Available' : 'Booked' %> |
                             <%= booking.is_lab ? 'Lab' : 'Lecture' %>
@@ -87,10 +87,12 @@
         .then(data => {
           document.getElementById("courses-list").innerHTML = data.html;
           document.querySelectorAll('td.table-cell').forEach(cell => {
+                cell.classList.remove('bg-warning-subtle');
+                cell.classList.remove('bg-warning');
                 if (cell.dataset.roomId === roomId && cell.dataset.timeSlotId === timeSlotId) {
+                    cell.classList.add('bg-warning');
+                } else if (cell.dataset.roomId === roomId || cell.dataset.timeSlotId === timeSlotId) {
                     cell.classList.add('bg-warning-subtle');
-                } else {
-                    cell.classList.remove('bg-warning-subtle');
                 }
             });
         });
diff --git a/db/schema.rb b/db/schema.rb
index 8774af9..5d5e216 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -48,16 +48,6 @@
     t.index ["schedule_id"], name: "index_instructors_on_schedule_id"
   end
 
-  create_table "room_blocks", force: :cascade do |t|
-    t.integer "room_id", null: false
-    t.integer "time_slot_id", null: false
-    t.boolean "is_blocked", default: true
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["room_id"], name: "index_room_blocks_on_room_id"
-    t.index ["time_slot_id"], name: "index_room_blocks_on_time_slot_id"
-  end
-
   create_table "room_bookings", force: :cascade do |t|
     t.integer "room_id", null: false
     t.integer "time_slot_id", null: false
@@ -127,8 +117,6 @@
   add_foreign_key "instructor_preferences", "courses"
   add_foreign_key "instructor_preferences", "instructors"
   add_foreign_key "instructors", "schedules"
-  add_foreign_key "room_blocks", "rooms"
-  add_foreign_key "room_blocks", "time_slots"
   add_foreign_key "room_bookings", "instructors"
   add_foreign_key "room_bookings", "rooms"
   add_foreign_key "room_bookings", "time_slots"

From f82c4c59db2c91c41191e92396585306c0d8cf01 Mon Sep 17 00:00:00 2001
From: Wahib Kapdi <wahibkapdi@tamu.edu>
Date: Thu, 31 Oct 2024 15:50:05 -0500
Subject: [PATCH 06/13] DB Structure Fixed

---
 app/controllers/room_bookings_controller.rb   | 24 +++++++----
 app/models/room_booking.rb                    |  1 +
 app/models/section.rb                         |  1 +
 app/views/courses/_courses_list.html.erb      | 40 ++++++-------------
 config/routes.rb                              |  2 +-
 ...tructor_id_in_room_bookings_to_nullable.rb |  5 +++
 ...1031204719_add_section_to_room_bookings.rb |  5 +++
 db/schema.rb                                  |  7 +++-
 8 files changed, 47 insertions(+), 38 deletions(-)
 create mode 100644 db/migrate/20241031203245_change_instructor_id_in_room_bookings_to_nullable.rb
 create mode 100644 db/migrate/20241031204719_add_section_to_room_bookings.rb

diff --git a/app/controllers/room_bookings_controller.rb b/app/controllers/room_bookings_controller.rb
index 8813f32..26cc4d2 100644
--- a/app/controllers/room_bookings_controller.rb
+++ b/app/controllers/room_bookings_controller.rb
@@ -23,18 +23,28 @@ def index
 
 
   def create
-    room_booking = RoomBooking.new(room_booking_params)
-
-    if room_booking.save
-      render json: { message: 'Room booking created successfully', room_booking: room_booking }, status: :created
-    else
-      render json: { error: 'Failed to create room booking', details: room_booking.errors.full_messages }, status: :unprocessable_entity
+    room_booking = RoomBooking.new!(room_booking_params)
+    puts (params[:room_id])
+    puts (params[:time_slot_id])
+    puts params[:section_id]
+    puts params[:schedule_id]
+    @schedule = Schedule.find(params[:schedule_id]);
+
+    respond_to do |format|
+      if room_booking.save!
+        format.html { redirect_to schedule_room_booking_path(@schedule), notice: "Movie was successfully created." }
+        format.json { render :index, status: :created }
+      else
+        render json: { error: 'Failed to create room booking', details: room_booking.errors.full_messages }, status: :unprocessable_entity
+        flash[:alert] = "Did not work"
+      end
     end
   end
 
   private
 
   def room_booking_params
-    params.require(:room_booking).permit(:room_id, :time_slot_id, :is_available, :is_lab, :instructor_id)
+    puts "HERE"
+    params.require(:room_booking).permit(:room_id, :time_slot_id, :is_available, :is_lab, :instructor_id, :section_id)
   end
 end
diff --git a/app/models/room_booking.rb b/app/models/room_booking.rb
index 850e9a8..510240f 100644
--- a/app/models/room_booking.rb
+++ b/app/models/room_booking.rb
@@ -3,4 +3,5 @@
 class RoomBooking < ApplicationRecord
   belongs_to :room
   belongs_to :time_slot
+  belongs_to :section
 end
diff --git a/app/models/section.rb b/app/models/section.rb
index 7e42841..36e6034 100644
--- a/app/models/section.rb
+++ b/app/models/section.rb
@@ -3,4 +3,5 @@
 # Section model
 class Section < ApplicationRecord
   belongs_to :course
+  has_one :room_booking, optional: true
 end
diff --git a/app/views/courses/_courses_list.html.erb b/app/views/courses/_courses_list.html.erb
index 3d0919a..ecf3f8c 100644
--- a/app/views/courses/_courses_list.html.erb
+++ b/app/views/courses/_courses_list.html.erb
@@ -10,37 +10,21 @@
                     <small class="text-muted">Seats: <%= section.seats_alloted %></small>
                 </div>
                 <div class="badge bg-info-subtle text-dark rounded">Type: <%= section.course.lecture_type %></div>
+                <%= link_to(
+                'Select',
+                schedule_room_bookings_path(
+                    schedule_id: @schedule.id,
+                    room_id: params[:room_id],
+                    time_slot_id: params[:time_slot_id],
+                    section_id: section.id,
+                    instructor_id: -1
+                ),
+                data: { turbo_method: :post },
+                class: 'btn btn-primary my-1 text-xs'
+            ) %>
             </div>
         <% end %>
     </div>
 <% else %>
     <p>No courses available for the selected room and time slot.</p>
 <% end %>
-<script language="javascript" type="text/javascript">
-  document.addEventListener("DOMContentLoaded", () => {
-    document.querySelectorAll(".section-item").forEach(item => {
-      item.addEventListener("click", function() {
-        const roomId = this.dataset.roomId;
-        const timeSlotId = this.dataset.timeSlotId;
-        const sectionId = this.dataset.sectionId;
-
-        fetch("/room_bookings", {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            "X-CSRF-Token": "<%= form_authenticity_token %>"
-          },
-          body: JSON.stringify({ room_id: roomId, time_slot_id: timeSlotId, section_id: sectionId })
-        })
-        .then(response => response.json())
-        .then(data => {
-          if (data.success) {
-            alert(data.message);
-          } else {
-            alert("Failed to create room booking.");
-          }
-        });
-      });
-    });
-  });
-</script>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 46df8f5..7506f15 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -42,7 +42,7 @@
     get '/time_slots', to: 'time_slots#index'
     post '/courses/fetch_courses', to: 'courses#fetch_courses'
 
-    resources :room_bookings, only: [:index]
+    resources :room_bookings, only: [:index, :create]
   end
 
   # Show Time Slot View
diff --git a/db/migrate/20241031203245_change_instructor_id_in_room_bookings_to_nullable.rb b/db/migrate/20241031203245_change_instructor_id_in_room_bookings_to_nullable.rb
new file mode 100644
index 0000000..66415b1
--- /dev/null
+++ b/db/migrate/20241031203245_change_instructor_id_in_room_bookings_to_nullable.rb
@@ -0,0 +1,5 @@
+class ChangeInstructorIdInRoomBookingsToNullable < ActiveRecord::Migration[7.2]
+  def change
+    change_column_null :room_bookings, :instructor_id, true
+  end
+end
diff --git a/db/migrate/20241031204719_add_section_to_room_bookings.rb b/db/migrate/20241031204719_add_section_to_room_bookings.rb
new file mode 100644
index 0000000..18045d6
--- /dev/null
+++ b/db/migrate/20241031204719_add_section_to_room_bookings.rb
@@ -0,0 +1,5 @@
+class AddSectionToRoomBookings < ActiveRecord::Migration[7.2]
+  def change
+    add_reference :room_bookings, :section, foreign_key: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5d5e216..187c9ce 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2024_10_31_023936) do
+ActiveRecord::Schema[7.2].define(version: 2024_10_31_204719) do
   create_table "courses", force: :cascade do |t|
     t.string "course_number"
     t.integer "max_seats"
@@ -55,9 +55,11 @@
     t.boolean "is_lab"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.integer "instructor_id", null: false
+    t.integer "instructor_id"
+    t.integer "section_id"
     t.index ["instructor_id"], name: "index_room_bookings_on_instructor_id"
     t.index ["room_id"], name: "index_room_bookings_on_room_id"
+    t.index ["section_id"], name: "index_room_bookings_on_section_id"
     t.index ["time_slot_id"], name: "index_room_bookings_on_time_slot_id"
   end
 
@@ -119,6 +121,7 @@
   add_foreign_key "instructors", "schedules"
   add_foreign_key "room_bookings", "instructors"
   add_foreign_key "room_bookings", "rooms"
+  add_foreign_key "room_bookings", "sections"
   add_foreign_key "room_bookings", "time_slots"
   add_foreign_key "rooms", "schedules"
   add_foreign_key "sections", "courses"

From 72624cb7c7c91befed8acab340a6eb8e1fb73af3 Mon Sep 17 00:00:00 2001
From: Wahib Kapdi <wahibkapdi@tamu.edu>
Date: Thu, 31 Oct 2024 16:12:43 -0500
Subject: [PATCH 07/13] Course adding using schedule added

---
 app/controllers/room_bookings_controller.rb |  7 ++++---
 app/models/section.rb                       |  2 +-
 app/views/courses/_courses_list.html.erb    | 11 ++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/controllers/room_bookings_controller.rb b/app/controllers/room_bookings_controller.rb
index 26cc4d2..7f17d6c 100644
--- a/app/controllers/room_bookings_controller.rb
+++ b/app/controllers/room_bookings_controller.rb
@@ -23,7 +23,7 @@ def index
 
 
   def create
-    room_booking = RoomBooking.new!(room_booking_params)
+    room_booking = RoomBooking.new(room_booking_params)
     puts (params[:room_id])
     puts (params[:time_slot_id])
     puts params[:section_id]
@@ -31,8 +31,8 @@ def create
     @schedule = Schedule.find(params[:schedule_id]);
 
     respond_to do |format|
-      if room_booking.save!
-        format.html { redirect_to schedule_room_booking_path(@schedule), notice: "Movie was successfully created." }
+      if room_booking.save
+        format.html { redirect_to schedule_room_bookings_path(@schedule), notice: "Movie was successfully created." }
         format.json { render :index, status: :created }
       else
         render json: { error: 'Failed to create room booking', details: room_booking.errors.full_messages }, status: :unprocessable_entity
@@ -45,6 +45,7 @@ def create
 
   def room_booking_params
     puts "HERE"
+    puts :room_booking
     params.require(:room_booking).permit(:room_id, :time_slot_id, :is_available, :is_lab, :instructor_id, :section_id)
   end
 end
diff --git a/app/models/section.rb b/app/models/section.rb
index 36e6034..f51af16 100644
--- a/app/models/section.rb
+++ b/app/models/section.rb
@@ -3,5 +3,5 @@
 # Section model
 class Section < ApplicationRecord
   belongs_to :course
-  has_one :room_booking, optional: true
+  has_one :room_booking
 end
diff --git a/app/views/courses/_courses_list.html.erb b/app/views/courses/_courses_list.html.erb
index ecf3f8c..0d6a000 100644
--- a/app/views/courses/_courses_list.html.erb
+++ b/app/views/courses/_courses_list.html.erb
@@ -13,11 +13,12 @@
                 <%= link_to(
                 'Select',
                 schedule_room_bookings_path(
-                    schedule_id: @schedule.id,
-                    room_id: params[:room_id],
-                    time_slot_id: params[:time_slot_id],
-                    section_id: section.id,
-                    instructor_id: -1
+                  schedule_id: params[:schedule_id],
+                  room_booking: {
+                      room_id: params[:room_id],
+                      time_slot_id: params[:time_slot_id],
+                      section_id: section.id
+                  }
                 ),
                 data: { turbo_method: :post },
                 class: 'btn btn-primary my-1 text-xs'

From 175f24db440ea22c44a14bbc92588cb7ba343ea0 Mon Sep 17 00:00:00 2001
From: Wahib Kapdi <wahibkapdi@tamu.edu>
Date: Thu, 31 Oct 2024 17:49:41 -0500
Subject: [PATCH 08/13] Some structure added

---
 app/controllers/room_bookings_controller.rb | 16 ++++++-------
 app/models/instructor.rb                    |  1 +
 app/models/room_booking.rb                  |  1 +
 app/views/room_bookings/index.html.erb      | 25 +++++++++++++++++++--
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/app/controllers/room_bookings_controller.rb b/app/controllers/room_bookings_controller.rb
index 7f17d6c..fbcef0e 100644
--- a/app/controllers/room_bookings_controller.rb
+++ b/app/controllers/room_bookings_controller.rb
@@ -10,10 +10,16 @@ def index
     @active_tab = params[:active_tab] || @tabs[0]
     @time_slots = TimeSlot.where(time_slots: { day: @active_tab }).to_a
     @time_slots.sort_by! { |ts| Time.parse(ts.start_time) }
+    @instructors = @schedule.instructors
 
     # Fetch room bookings only for the specified schedule
-    @room_bookings = RoomBooking.joins(:room, :time_slot)
-                                .where(rooms: { schedule_id: }, time_slots: { day: @active_tab })
+    @room_bookings = RoomBooking.includes(
+                        room: {},
+                        section: [:course],
+                        time_slot: {},
+                        instructor: {}
+                      ).where(rooms: { schedule_id: schedule_id }, time_slots: { day: @active_tab })
+                      
 
     # Organize room bookings in a hash with room_id and time_slot_id as keys
     @bookings_matrix = @room_bookings.each_with_object({}) do |booking, hash|
@@ -24,10 +30,6 @@ def index
 
   def create
     room_booking = RoomBooking.new(room_booking_params)
-    puts (params[:room_id])
-    puts (params[:time_slot_id])
-    puts params[:section_id]
-    puts params[:schedule_id]
     @schedule = Schedule.find(params[:schedule_id]);
 
     respond_to do |format|
@@ -44,8 +46,6 @@ def create
   private
 
   def room_booking_params
-    puts "HERE"
-    puts :room_booking
     params.require(:room_booking).permit(:room_id, :time_slot_id, :is_available, :is_lab, :instructor_id, :section_id)
   end
 end
diff --git a/app/models/instructor.rb b/app/models/instructor.rb
index 90287cd..2d821f1 100644
--- a/app/models/instructor.rb
+++ b/app/models/instructor.rb
@@ -4,4 +4,5 @@
 class Instructor < ApplicationRecord
   belongs_to :schedule
   has_many :instructor_preferences, dependent: :destroy
+  has_many :room_bookings
 end
diff --git a/app/models/room_booking.rb b/app/models/room_booking.rb
index 510240f..ccec01b 100644
--- a/app/models/room_booking.rb
+++ b/app/models/room_booking.rb
@@ -4,4 +4,5 @@ class RoomBooking < ApplicationRecord
   belongs_to :room
   belongs_to :time_slot
   belongs_to :section
+  belongs_to :instructor, optional: true
 end
diff --git a/app/views/room_bookings/index.html.erb b/app/views/room_bookings/index.html.erb
index c0adcc1..c106606 100644
--- a/app/views/room_bookings/index.html.erb
+++ b/app/views/room_bookings/index.html.erb
@@ -50,8 +50,29 @@
                         
                         <td class="table-cell <%= "bg-primary-subtle" if room.is_lab? %>" data-room-id="<%= room.id %>" data-time-slot-id="<%= time_slot.id %>">
                             <% if booking %>
-                            <%= booking.is_available ? 'Available' : 'Booked' %> |
-                            <%= booking.is_lab ? 'Lab' : 'Lecture' %>
+                                <strong>
+                                    <%= booking.section.course.course_number %>
+                                    (<%= booking.section.section_number %>)
+                                </strong> |
+                                <%= booking.section.seats_alloted %>
+                                <%
+=begin%>
+ <% if booking.instructor %>
+                                    <%= link_to booking.instructor.first_name, schedule_room_bookings_path(@schedule), class: 'btn btn-primary' %>
+                                <% else %>
+                                    <%= link_to 'Assign Instructor', schedule_room_bookings_path(@schedule), class: 'btn btn-primary' %>
+                                <% end %> 
+<%
+=end%>
+                                <%= form_with model: @room_booking, local: true do |form| %>
+                                    <div class="field">
+                                        <%= form.select :instructor_id, options_from_collection_for_select(@instructors, :id, :first_name, :last_name) %>
+                                    </div>
+
+                                    <div class="actions">
+                                        <%= form.submit "Assign Instructor" %>
+                                    </div>
+                                <% end %>
                             <% else %>
                             <% end %>
                         </td>

From 655d764ba5d044111b3d12b531d5077b01aabd62 Mon Sep 17 00:00:00 2001
From: Navya N <navyan@Navyas-MacBook-Pro-2.local>
Date: Thu, 31 Oct 2024 21:17:46 -0500
Subject: [PATCH 09/13] delete and lock courses buttons

---
 app/controllers/room_bookings_controller.rb   | 26 +++++++
 app/javascript/room_bookings.js               |  2 +-
 app/views/room_bookings/index.html.erb        | 74 ++++++++++---------
 config/routes.rb                              |  7 +-
 ...01020805_add_is_locked_to_room_bookings.rb |  5 ++
 db/schema.rb                                  | 15 +++-
 6 files changed, 91 insertions(+), 38 deletions(-)
 create mode 100644 db/migrate/20241101020805_add_is_locked_to_room_bookings.rb

diff --git a/app/controllers/room_bookings_controller.rb b/app/controllers/room_bookings_controller.rb
index fbcef0e..c8a1f81 100644
--- a/app/controllers/room_bookings_controller.rb
+++ b/app/controllers/room_bookings_controller.rb
@@ -43,6 +43,32 @@ def create
     end
   end
 
+  def destroy
+    @room_booking = RoomBooking.find_by(id: params[:id])
+
+    if @room_booking
+      @room_booking.destroy
+      flash[:notice] = "Room booking deleted successfully."
+    else
+      flash[:alert] = "Room booking not found."
+    end
+
+    redirect_to room_bookings_path  # Redirect to the list of room bookings or another appropriate page
+  end
+
+  def toggle_lock
+    @room_booking = RoomBooking.find(params[:id])
+
+    # Toggle the `is_locked` value
+    @room_booking.update(is_locked: !@room_booking.is_locked)
+
+    # Optionally add a notice or alert to show success or failure
+    flash[:notice] = "Room booking lock status updated successfully."
+
+    # Redirect to the previous page or another relevant page
+    redirect_back(fallback_location: room_bookings_path)
+  end
+
   private
 
   def room_booking_params
diff --git a/app/javascript/room_bookings.js b/app/javascript/room_bookings.js
index 543cadb..2c4c01b 100644
--- a/app/javascript/room_bookings.js
+++ b/app/javascript/room_bookings.js
@@ -1,4 +1,4 @@
-document.addEventListener("DOMContentLoaded", function () {
+document.addEventListener("turbo:load", function () {
     const tds = document.querySelectorAll(".grid-view-matrix td");
     
     tds.forEach((td) => {
diff --git a/app/views/room_bookings/index.html.erb b/app/views/room_bookings/index.html.erb
index c106606..784899e 100644
--- a/app/views/room_bookings/index.html.erb
+++ b/app/views/room_bookings/index.html.erb
@@ -55,15 +55,9 @@
                                     (<%= booking.section.section_number %>)
                                 </strong> |
                                 <%= booking.section.seats_alloted %>
-                                <%
-=begin%>
- <% if booking.instructor %>
-                                    <%= link_to booking.instructor.first_name, schedule_room_bookings_path(@schedule), class: 'btn btn-primary' %>
-                                <% else %>
-                                    <%= link_to 'Assign Instructor', schedule_room_bookings_path(@schedule), class: 'btn btn-primary' %>
-                                <% end %> 
-<%
-=end%>
+<%= link_to "Delete", schedule_room_booking_path(@schedule,booking), method: :delete, data: { confirm: "Are you sure you want to delete this booking?",turbo_method: :delete  }, class: "btn btn-danger" %>
+<%= link_to (booking.is_locked ? "Locked" : "Unlocked"), toggle_lock_schedule_room_booking_path(@schedule, booking), method: :patch, class: "btn btn-warning", data: { confirm: "Are you sure you want to toggle the lock status?", turbo_method: :patch } %>
+
                                 <%= form_with model: @room_booking, local: true do |form| %>
                                     <div class="field">
                                         <%= form.select :instructor_id, options_from_collection_for_select(@instructors, :id, :first_name, :last_name) %>
@@ -90,34 +84,44 @@
     <p class="container h1 text-secondary">No rooms added to this schedule, click on View Data to Add Rooms!</p>
 <% end %>
 <script>
-  document.addEventListener("DOMContentLoaded", () => {
-    document.querySelectorAll(".table-cell").forEach(cell => {
-      cell.addEventListener("click", function() {
-        const roomId = this.dataset.roomId;
-        const timeSlotId = this.dataset.timeSlotId;
+  document.addEventListener("turbo:load", () => {
+    function attachEventListeners() {
+      document.querySelectorAll(".table-cell").forEach(cell => {
+        cell.addEventListener("click", function() {
+          const roomId = this.dataset.roomId;
+          const timeSlotId = this.dataset.timeSlotId;
+
+          fetch("courses/fetch_courses", {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+              "X-CSRF-Token": "<%= form_authenticity_token %>"
+            },
+            body: JSON.stringify({ room_id: roomId, time_slot_id: timeSlotId })
+          })
+          .then(response => response.json())
+          .then(data => {
+            document.getElementById("courses-list").innerHTML = data.html;
 
-        fetch("courses/fetch_courses", {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            "X-CSRF-Token": "<%= form_authenticity_token %>"
-          },
-          body: JSON.stringify({ room_id: roomId, time_slot_id: timeSlotId })
-        })
-        .then(response => response.json())
-        .then(data => {
-          document.getElementById("courses-list").innerHTML = data.html;
-          document.querySelectorAll('td.table-cell').forEach(cell => {
-                cell.classList.remove('bg-warning-subtle');
-                cell.classList.remove('bg-warning');
-                if (cell.dataset.roomId === roomId && cell.dataset.timeSlotId === timeSlotId) {
-                    cell.classList.add('bg-warning');
-                } else if (cell.dataset.roomId === roomId || cell.dataset.timeSlotId === timeSlotId) {
-                    cell.classList.add('bg-warning-subtle');
-                }
+            // Re-attach event listeners after content update
+            attachEventListeners();
+
+            // Update cell classes
+            document.querySelectorAll('td.table-cell').forEach(cell => {
+              cell.classList.remove('bg-warning-subtle');
+              cell.classList.remove('bg-warning');
+              if (cell.dataset.roomId === roomId && cell.dataset.timeSlotId === timeSlotId) {
+                cell.classList.add('bg-warning');
+              } else if (cell.dataset.roomId === roomId || cell.dataset.timeSlotId === timeSlotId) {
+                cell.classList.add('bg-warning-subtle');
+              }
             });
+          });
         });
       });
-    });
+    }
+
+    // Initial attachment of event listeners
+    attachEventListeners();
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/config/routes.rb b/config/routes.rb
index 7506f15..55c5c05 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -42,7 +42,12 @@
     get '/time_slots', to: 'time_slots#index'
     post '/courses/fetch_courses', to: 'courses#fetch_courses'
 
-    resources :room_bookings, only: [:index, :create]
+    resources :room_bookings, only: [:index, :create, :destroy] do
+      member do
+        patch :toggle_lock
+      end
+    end
+    
   end
 
   # Show Time Slot View
diff --git a/db/migrate/20241101020805_add_is_locked_to_room_bookings.rb b/db/migrate/20241101020805_add_is_locked_to_room_bookings.rb
new file mode 100644
index 0000000..0a9e316
--- /dev/null
+++ b/db/migrate/20241101020805_add_is_locked_to_room_bookings.rb
@@ -0,0 +1,5 @@
+class AddIsLockedToRoomBookings < ActiveRecord::Migration[7.2]
+  def change
+    add_column :room_bookings, :is_locked, :boolean
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 187c9ce..b1db9c5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2024_10_31_204719) do
+ActiveRecord::Schema[7.2].define(version: 2024_11_01_020805) do
   create_table "courses", force: :cascade do |t|
     t.string "course_number"
     t.integer "max_seats"
@@ -48,6 +48,16 @@
     t.index ["schedule_id"], name: "index_instructors_on_schedule_id"
   end
 
+  create_table "room_blocks", force: :cascade do |t|
+    t.integer "room_id", null: false
+    t.integer "time_slot_id", null: false
+    t.boolean "is_blocked", default: true
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["room_id"], name: "index_room_blocks_on_room_id"
+    t.index ["time_slot_id"], name: "index_room_blocks_on_time_slot_id"
+  end
+
   create_table "room_bookings", force: :cascade do |t|
     t.integer "room_id", null: false
     t.integer "time_slot_id", null: false
@@ -57,6 +67,7 @@
     t.datetime "updated_at", null: false
     t.integer "instructor_id"
     t.integer "section_id"
+    t.boolean "is_locked"
     t.index ["instructor_id"], name: "index_room_bookings_on_instructor_id"
     t.index ["room_id"], name: "index_room_bookings_on_room_id"
     t.index ["section_id"], name: "index_room_bookings_on_section_id"
@@ -119,6 +130,8 @@
   add_foreign_key "instructor_preferences", "courses"
   add_foreign_key "instructor_preferences", "instructors"
   add_foreign_key "instructors", "schedules"
+  add_foreign_key "room_blocks", "rooms"
+  add_foreign_key "room_blocks", "time_slots"
   add_foreign_key "room_bookings", "instructors"
   add_foreign_key "room_bookings", "rooms"
   add_foreign_key "room_bookings", "sections"

From c1d14d8c75f5c972e167e704dd23e334fec6f1d7 Mon Sep 17 00:00:00 2001
From: Wahib Kapdi <wahibkapdi@tamu.edu>
Date: Fri, 1 Nov 2024 12:00:11 -0500
Subject: [PATCH 10/13] Instructor Addition Added

---
 app/controllers/room_bookings_controller.rb | 13 ++++++++
 app/views/room_bookings/index.html.erb      | 35 +++++++++++++++------
 config/routes.rb                            |  1 +
 db/schema.rb                                | 12 -------
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/app/controllers/room_bookings_controller.rb b/app/controllers/room_bookings_controller.rb
index c8a1f81..d96a2e2 100644
--- a/app/controllers/room_bookings_controller.rb
+++ b/app/controllers/room_bookings_controller.rb
@@ -69,6 +69,19 @@ def toggle_lock
     redirect_back(fallback_location: room_bookings_path)
   end
 
+  def update_instructor
+    @booking = RoomBooking.find(params[:id])
+  
+    if @booking.update(instructor_id: params[:room_booking][:instructor_id])
+      flash[:notice] = "Instructor updated successfully."
+    else
+      flash[:alert] = "Failed to update instructor."
+    end
+    
+    # Redirect to the previous page or another relevant page
+    redirect_back(fallback_location: room_bookings_path)
+  end
+
   private
 
   def room_booking_params
diff --git a/app/views/room_bookings/index.html.erb b/app/views/room_bookings/index.html.erb
index 784899e..b84cdf8 100644
--- a/app/views/room_bookings/index.html.erb
+++ b/app/views/room_bookings/index.html.erb
@@ -55,18 +55,34 @@
                                     (<%= booking.section.section_number %>)
                                 </strong> |
                                 <%= booking.section.seats_alloted %>
-<%= link_to "Delete", schedule_room_booking_path(@schedule,booking), method: :delete, data: { confirm: "Are you sure you want to delete this booking?",turbo_method: :delete  }, class: "btn btn-danger" %>
-<%= link_to (booking.is_locked ? "Locked" : "Unlocked"), toggle_lock_schedule_room_booking_path(@schedule, booking), method: :patch, class: "btn btn-warning", data: { confirm: "Are you sure you want to toggle the lock status?", turbo_method: :patch } %>
-
-                                <%= form_with model: @room_booking, local: true do |form| %>
+                                <%= link_to "Delete", 
+                                    schedule_room_booking_path(@schedule,booking), 
+                                    method: :delete, 
+                                    data: { 
+                                        confirm: "Are you sure you want to delete this booking?",
+                                        turbo_method: :delete
+                                    }, 
+                                    class: "btn btn-danger" %>
+                                <%= link_to (booking.is_locked ? "Locked" : "Unlocked"), 
+                                    toggle_lock_schedule_room_booking_path(@schedule, booking), 
+                                    method: :patch, 
+                                    class: "btn btn-warning", 
+                                    data: { 
+                                        confirm: "Are you sure you want to toggle the lock status?", 
+                                        turbo_method: :patch 
+                                    } %>
+                                <%= form_with model: booking, 
+                                    url: update_instructor_schedule_room_booking_path(@schedule, booking), 
+                                    method: :patch,
+                                    data: { 
+                                        turbo_method: :patch
+                                    }, 
+                                    remote: true do |form| %>
                                     <div class="field">
-                                        <%= form.select :instructor_id, options_from_collection_for_select(@instructors, :id, :first_name, :last_name) %>
-                                    </div>
-
-                                    <div class="actions">
-                                        <%= form.submit "Assign Instructor" %>
+                                        <%= form.select :instructor_id, options_from_collection_for_select(@instructors, :id, :first_name, booking.instructor_id), { prompt: "Select Instructor" }, onchange: "this.form.submit()" %>
                                     </div>
                                 <% end %>
+
                             <% else %>
                             <% end %>
                         </td>
@@ -85,6 +101,7 @@
 <% end %>
 <script>
   document.addEventListener("turbo:load", () => {
+    const csrfToken = document.querySelector('meta[name="csrf-token"]').content;
     function attachEventListeners() {
       document.querySelectorAll(".table-cell").forEach(cell => {
         cell.addEventListener("click", function() {
diff --git a/config/routes.rb b/config/routes.rb
index 55c5c05..bd188d6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -45,6 +45,7 @@
     resources :room_bookings, only: [:index, :create, :destroy] do
       member do
         patch :toggle_lock
+        patch :update_instructor
       end
     end
     
diff --git a/db/schema.rb b/db/schema.rb
index b1db9c5..27e2ced 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -48,16 +48,6 @@
     t.index ["schedule_id"], name: "index_instructors_on_schedule_id"
   end
 
-  create_table "room_blocks", force: :cascade do |t|
-    t.integer "room_id", null: false
-    t.integer "time_slot_id", null: false
-    t.boolean "is_blocked", default: true
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["room_id"], name: "index_room_blocks_on_room_id"
-    t.index ["time_slot_id"], name: "index_room_blocks_on_time_slot_id"
-  end
-
   create_table "room_bookings", force: :cascade do |t|
     t.integer "room_id", null: false
     t.integer "time_slot_id", null: false
@@ -130,8 +120,6 @@
   add_foreign_key "instructor_preferences", "courses"
   add_foreign_key "instructor_preferences", "instructors"
   add_foreign_key "instructors", "schedules"
-  add_foreign_key "room_blocks", "rooms"
-  add_foreign_key "room_blocks", "time_slots"
   add_foreign_key "room_bookings", "instructors"
   add_foreign_key "room_bookings", "rooms"
   add_foreign_key "room_bookings", "sections"

From 242ba65b5b1ca61d64d2f6fc3427005ce11f7184 Mon Sep 17 00:00:00 2001
From: Wahib Kapdi <wahibkapdi@tamu.edu>
Date: Fri, 1 Nov 2024 13:01:18 -0500
Subject: [PATCH 11/13] Speed of requests improved

---
 app/controllers/courses_controller.rb         |  2 +-
 app/controllers/room_bookings_controller.rb   |  3 +-
 app/helpers/room_bookings_helper.rb           |  7 +++
 app/views/room_bookings/index.html.erb        | 43 ++++++++-----------
 .../_courses_list.html.erb                    |  8 +++-
 5 files changed, 33 insertions(+), 30 deletions(-)
 rename app/views/{courses => shared}/_courses_list.html.erb (84%)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 76a7a7f..b803edf 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -19,7 +19,7 @@ def fetch_courses
     @courses = @schedule.courses
     @sections = Section.joins(:course)
 
-    render json: { html: render_to_string(partial: "courses_list", locals: { sections: @sections }) }
+    render json: { html: render_to_string(partial: "/shared/courses_list", locals: { sections: @sections }) }
   end
 
   private
diff --git a/app/controllers/room_bookings_controller.rb b/app/controllers/room_bookings_controller.rb
index d96a2e2..7793730 100644
--- a/app/controllers/room_bookings_controller.rb
+++ b/app/controllers/room_bookings_controller.rb
@@ -7,7 +7,8 @@ def index
     @schedule = Schedule.find(params[:schedule_id])
     @rooms = @schedule.rooms.where(is_active: true).where.not(building_code: 'ONLINE')
     @tabs = TimeSlot.distinct.pluck(:day)
-    @active_tab = params[:active_tab] || @tabs[0]
+    @active_tab = params[:active_tab] || session[:active_rb_tab] || @tabs[0]
+    session[:active_rb_tab] = @active_tab
     @time_slots = TimeSlot.where(time_slots: { day: @active_tab }).to_a
     @time_slots.sort_by! { |ts| Time.parse(ts.start_time) }
     @instructors = @schedule.instructors
diff --git a/app/helpers/room_bookings_helper.rb b/app/helpers/room_bookings_helper.rb
index 75f8f52..f3fe468 100644
--- a/app/helpers/room_bookings_helper.rb
+++ b/app/helpers/room_bookings_helper.rb
@@ -2,4 +2,11 @@
 
 # Room Bookings Helper
 module RoomBookingsHelper
+    def available_sections schedule
+        @sections = Section.joins(:course)
+         .where(courses: { schedule_id: schedule.id })
+         .left_joins(:room_booking)
+         .where(room_booking: { id: nil })
+        render partial: '/shared/courses_list', locals: { sections: @sections }
+    end
 end
diff --git a/app/views/room_bookings/index.html.erb b/app/views/room_bookings/index.html.erb
index b84cdf8..0810b68 100644
--- a/app/views/room_bookings/index.html.erb
+++ b/app/views/room_bookings/index.html.erb
@@ -94,6 +94,7 @@
         </div>
     </div>
     <div id="courses-list" class="col-2 bg-secondary-subtle vh-100 overflow-auto p-3">
+        <%= available_sections(@schedule) %>
     </div>
 </div>
 <% else %>
@@ -105,35 +106,25 @@
     function attachEventListeners() {
       document.querySelectorAll(".table-cell").forEach(cell => {
         cell.addEventListener("click", function() {
-          const roomId = this.dataset.roomId;
-          const timeSlotId = this.dataset.timeSlotId;
+            
+            const roomId = this.dataset.roomId;
+            const timeSlotId = this.dataset.timeSlotId;
 
-          fetch("courses/fetch_courses", {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-              "X-CSRF-Token": "<%= form_authenticity_token %>"
-            },
-            body: JSON.stringify({ room_id: roomId, time_slot_id: timeSlotId })
-          })
-          .then(response => response.json())
-          .then(data => {
-            document.getElementById("courses-list").innerHTML = data.html;
-
-            // Re-attach event listeners after content update
-            attachEventListeners();
-
-            // Update cell classes
+             // Update cell classes
             document.querySelectorAll('td.table-cell').forEach(cell => {
-              cell.classList.remove('bg-warning-subtle');
-              cell.classList.remove('bg-warning');
-              if (cell.dataset.roomId === roomId && cell.dataset.timeSlotId === timeSlotId) {
-                cell.classList.add('bg-warning');
-              } else if (cell.dataset.roomId === roomId || cell.dataset.timeSlotId === timeSlotId) {
-                cell.classList.add('bg-warning-subtle');
-              }
+                cell.classList.remove('bg-warning-subtle');
+                cell.classList.remove('bg-warning');
+                if (cell.dataset.roomId === roomId && cell.dataset.timeSlotId === timeSlotId) {
+                    cell.classList.add('bg-warning');
+                } else if (cell.dataset.roomId === roomId || cell.dataset.timeSlotId === timeSlotId) {
+                    cell.classList.add('bg-warning-subtle');
+                }
             });
-          });
+
+            document.querySelectorAll('a.course-select-btn').forEach(button => {
+                const sectionId = button.dataset.section
+                button.href = `/schedules/1/room_bookings?room_booking%5Broom_id%5D=${roomId}&room_booking%5Bsection_id%5D=${sectionId}&room_booking%5Btime_slot_id%5D=${timeSlotId}`
+            })
         });
       });
     }
diff --git a/app/views/courses/_courses_list.html.erb b/app/views/shared/_courses_list.html.erb
similarity index 84%
rename from app/views/courses/_courses_list.html.erb
rename to app/views/shared/_courses_list.html.erb
index 0d6a000..2bfc822 100644
--- a/app/views/courses/_courses_list.html.erb
+++ b/app/views/shared/_courses_list.html.erb
@@ -1,4 +1,5 @@
 <% if sections.present? %>
+    <div id="courses-msg">Select a slot first</div>
     <div class="mt-3">
         <% sections.each do |section| %>
             <div class="section-item list-group-item list-group-item-action justify-content-between align-items-center bg-light border rounded-3 mb-2 p-2"
@@ -20,8 +21,11 @@
                       section_id: section.id
                   }
                 ),
-                data: { turbo_method: :post },
-                class: 'btn btn-primary my-1 text-xs'
+                data: { 
+                    turbo_method: :post,
+                    section: section.id     
+                },
+                class: 'btn btn-primary my-1 text-xs course-select-btn'
             ) %>
             </div>
         <% end %>

From b97f8d116ccea38ed6fd14f83d4ff8fc62c4ae12 Mon Sep 17 00:00:00 2001
From: Wahib Kapdi <wahibkapdi@tamu.edu>
Date: Fri, 1 Nov 2024 13:42:47 -0500
Subject: [PATCH 12/13] Rspec Tests Passed

---
 app/controllers/courses_controller.rb         | 11 ---
 app/controllers/room_bookings_controller.rb   |  5 +-
 config/routes.rb                              |  1 -
 .../room_bookings_controller_spec.rb          | 84 ++++++++++++++++++-
 spec/factories.rb                             |  4 +
 5 files changed, 89 insertions(+), 16 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index b803edf..70b91ea 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -11,17 +11,6 @@ def index
     @courses = @courses.order("#{sort_column} #{direction}")
   end
 
-  def fetch_courses
-    room_id = params[:room_id]
-    time_slot_id = params[:time_slot_id]
-
-    @schedule = Schedule.find(params[:schedule_id])
-    @courses = @schedule.courses
-    @sections = Section.joins(:course)
-
-    render json: { html: render_to_string(partial: "/shared/courses_list", locals: { sections: @sections }) }
-  end
-
   private
 
   # Define the allowed sorting columns
diff --git a/app/controllers/room_bookings_controller.rb b/app/controllers/room_bookings_controller.rb
index 7793730..327f06f 100644
--- a/app/controllers/room_bookings_controller.rb
+++ b/app/controllers/room_bookings_controller.rb
@@ -38,13 +38,14 @@ def create
         format.html { redirect_to schedule_room_bookings_path(@schedule), notice: "Movie was successfully created." }
         format.json { render :index, status: :created }
       else
-        render json: { error: 'Failed to create room booking', details: room_booking.errors.full_messages }, status: :unprocessable_entity
         flash[:alert] = "Did not work"
+        render json: { error: 'Failed to create room booking', details: room_booking.errors.full_messages }, status: :unprocessable_entity
       end
     end
   end
 
   def destroy
+    @schedule = Schedule.find(params[:schedule_id]);
     @room_booking = RoomBooking.find_by(id: params[:id])
 
     if @room_booking
@@ -54,7 +55,7 @@ def destroy
       flash[:alert] = "Room booking not found."
     end
 
-    redirect_to room_bookings_path  # Redirect to the list of room bookings or another appropriate page
+    redirect_to schedule_room_bookings_path(@schedule)  # Redirect to the list of room bookings or another appropriate page
   end
 
   def toggle_lock
diff --git a/config/routes.rb b/config/routes.rb
index bd188d6..9b9ac8c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -40,7 +40,6 @@
     post 'time_slots', to: 'time_slots#filter', as: 'filter_time_slots'
 
     get '/time_slots', to: 'time_slots#index'
-    post '/courses/fetch_courses', to: 'courses#fetch_courses'
 
     resources :room_bookings, only: [:index, :create, :destroy] do
       member do
diff --git a/spec/controllers/room_bookings_controller_spec.rb b/spec/controllers/room_bookings_controller_spec.rb
index d2217cb..ebb058e 100644
--- a/spec/controllers/room_bookings_controller_spec.rb
+++ b/spec/controllers/room_bookings_controller_spec.rb
@@ -4,13 +4,17 @@
 require 'rails_helper'
 
 RSpec.describe RoomBookingsController, type: :controller do
+  render_views
   let!(:schedule) { create(:schedule) }
   let!(:room1) { create(:room, schedule:) }
   let!(:room2) { create(:room, schedule:) }
   let!(:time_slot1) { create(:time_slot, day: 'Monday', start_time: '09:00', end_time: '10:00') }
   let!(:time_slot2) { create(:time_slot, day: 'Monday', start_time: '10:00', end_time: '11:00') }
-  let!(:room_booking1) { create(:room_booking, room: room1, time_slot: time_slot1, is_available: true) }
-  let!(:room_booking2) { create(:room_booking, room: room2, time_slot: time_slot2, is_available: false) }
+  let(:course) { create(:course, schedule: schedule) }
+  let(:section) { create(:section, course: course) }
+  let!(:room_booking1) { create(:room_booking, room: room1, time_slot: time_slot1, section: section, is_available: true) }
+  let!(:room_booking2) { create(:room_booking, room: room2, time_slot: time_slot2, section: section, is_available: false) }
+  let(:instructor) { create(:instructor) }
 
   before do
     @user = User.create!(uid: '12345', provider: 'google_oauth2', email: 'test@example.com', first_name: 'John',
@@ -48,4 +52,80 @@
       end
     end
   end
+
+  describe 'POST #create' do
+    context 'with valid attributes' do
+      it 'creates a new room booking and redirects' do
+        post :create, params: {
+          schedule_id: schedule.id,
+          room_booking: {
+            room_id: room1.id,
+            time_slot_id: time_slot1.id,
+            section_id: section.id,
+            instructor_id: instructor.id,
+            is_available: true,
+            is_lab: false
+          }
+        }
+
+        expect(RoomBooking.count).to eq(3)
+        expect(flash[:notice]).to eq("Movie was successfully created.")
+        expect(response).to redirect_to(schedule_room_bookings_path(schedule))
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    it 'deletes the room booking and redirects with a success message' do
+      delete :destroy, params: { schedule_id: schedule.id, id: room_booking1.id }
+
+      expect(RoomBooking.exists?(room_booking1.id)).to be_falsey
+      expect(flash[:notice]).to eq("Room booking deleted successfully.")
+      expect(response).to redirect_to(schedule_room_bookings_path(schedule))
+    end
+
+    it 'renders an error when room booking does not exist' do
+      delete :destroy, params: { schedule_id: schedule.id, id: 999 }  # Non-existent room_booking ID
+
+      expect(flash[:alert]).to eq("Room booking not found.")
+      expect(response).to redirect_to(schedule_room_bookings_path(schedule))
+    end
+  end
+
+  describe 'PATCH #toggle_lock' do
+    it 'toggles the lock status of the room booking' do
+      room_booking1.update(is_locked: false)
+      patch :toggle_lock, params: { schedule_id: schedule.id, id: room_booking1.id }
+
+      room_booking1.reload
+      expect(room_booking1.is_locked).to be_truthy
+      expect(flash[:notice]).to eq("Room booking lock status updated successfully.")
+    end
+  end
+
+  describe 'PATCH #update_instructor' do
+    it 'updates the instructor for the room booking' do
+      another_instructor = create(:instructor)
+      patch :update_instructor, params: {
+        schedule_id: schedule.id,
+        id: room_booking1.id,
+        room_booking: { instructor_id: another_instructor.id }
+      }
+
+      room_booking1.reload
+      expect(room_booking1.instructor).to eq(another_instructor)
+      expect(flash[:notice]).to eq("Instructor updated successfully.")
+    end
+
+    it 'renders an error message when update fails' do
+      allow_any_instance_of(RoomBooking).to receive(:update).and_return(false)  # Force failure
+      patch :update_instructor, params: {
+        schedule_id: schedule.id,
+        id: room_booking1.id,
+        room_booking: { instructor_id: nil }
+      }
+
+      expect(flash[:alert]).to eq("Failed to update instructor.")
+    end
+  end
 end
diff --git a/spec/factories.rb b/spec/factories.rb
index 08c9cf8..95a709f 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -35,6 +35,10 @@
     association :room
     association :time_slot
     is_available { true }
+    is_lab { [true, false].sample }
+    is_locked { false }
+    association :instructor
+    association :section
   end
 
   factory :time_slot do

From 96343d623190f227d3f79e6f686f6c51a4c9f3bc Mon Sep 17 00:00:00 2001
From: Wahib Kapdi <wahibkapdi@tamu.edu>
Date: Fri, 1 Nov 2024 16:01:16 -0500
Subject: [PATCH 13/13] Create Merge Request

---
 .rubocop.yml                                  |   2 +
 app/controllers/room_bookings_controller.rb   |  36 ++--
 app/helpers/room_bookings_helper.rb           |  14 +-
 config/routes.rb                              |   3 +-
 ...936_add_instructor_ref_to_room_bookings.rb |   2 +
 ...tructor_id_in_room_bookings_to_nullable.rb |   2 +
 ...1031204719_add_section_to_room_bookings.rb |   2 +
 ...01020805_add_is_locked_to_room_bookings.rb |   2 +
 db/schema.rb                                  | 198 +++++++++---------
 features/room_bookings.feature                |  97 ++++++++-
 .../step_definitions/room_bookings_steps.rb   |  74 +++++++
 .../room_bookings_controller_spec.rb          |  24 +--
 12 files changed, 317 insertions(+), 139 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index a94c563..5a6a40e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,6 +8,8 @@ Metrics/CyclomaticComplexity:
   Max: 15
 Metrics/ClassLength:
   Max: 250
+Metrics/ParameterLists:
+  Max: 10
 AllCops:
   NewCops: enable
   TargetRubyVersion: 3.3.x
diff --git a/app/controllers/room_bookings_controller.rb b/app/controllers/room_bookings_controller.rb
index 327f06f..8aa2fc9 100644
--- a/app/controllers/room_bookings_controller.rb
+++ b/app/controllers/room_bookings_controller.rb
@@ -15,12 +15,11 @@ def index
 
     # Fetch room bookings only for the specified schedule
     @room_bookings = RoomBooking.includes(
-                        room: {},
-                        section: [:course],
-                        time_slot: {},
-                        instructor: {}
-                      ).where(rooms: { schedule_id: schedule_id }, time_slots: { day: @active_tab })
-                      
+      room: {},
+      section: [:course],
+      time_slot: {},
+      instructor: {}
+    ).where(rooms: { schedule_id: }, time_slots: { day: @active_tab })
 
     # Organize room bookings in a hash with room_id and time_slot_id as keys
     @bookings_matrix = @room_bookings.each_with_object({}) do |booking, hash|
@@ -28,34 +27,33 @@ def index
     end
   end
 
-
   def create
     room_booking = RoomBooking.new(room_booking_params)
-    @schedule = Schedule.find(params[:schedule_id]);
+    @schedule = Schedule.find(params[:schedule_id])
 
     respond_to do |format|
       if room_booking.save
-        format.html { redirect_to schedule_room_bookings_path(@schedule), notice: "Movie was successfully created." }
+        format.html { redirect_to schedule_room_bookings_path(@schedule), notice: 'Movie was successfully created.' }
         format.json { render :index, status: :created }
       else
-        flash[:alert] = "Did not work"
+        flash[:alert] = 'Did not work'
         render json: { error: 'Failed to create room booking', details: room_booking.errors.full_messages }, status: :unprocessable_entity
       end
     end
   end
 
   def destroy
-    @schedule = Schedule.find(params[:schedule_id]);
+    @schedule = Schedule.find(params[:schedule_id])
     @room_booking = RoomBooking.find_by(id: params[:id])
 
     if @room_booking
       @room_booking.destroy
-      flash[:notice] = "Room booking deleted successfully."
+      flash[:notice] = 'Room booking deleted successfully.'
     else
-      flash[:alert] = "Room booking not found."
+      flash[:alert] = 'Room booking not found.'
     end
 
-    redirect_to schedule_room_bookings_path(@schedule)  # Redirect to the list of room bookings or another appropriate page
+    redirect_to schedule_room_bookings_path(@schedule) # Redirect to the list of room bookings or another appropriate page
   end
 
   def toggle_lock
@@ -65,7 +63,7 @@ def toggle_lock
     @room_booking.update(is_locked: !@room_booking.is_locked)
 
     # Optionally add a notice or alert to show success or failure
-    flash[:notice] = "Room booking lock status updated successfully."
+    flash[:notice] = 'Room booking lock status updated successfully.'
 
     # Redirect to the previous page or another relevant page
     redirect_back(fallback_location: room_bookings_path)
@@ -73,13 +71,13 @@ def toggle_lock
 
   def update_instructor
     @booking = RoomBooking.find(params[:id])
-  
+
     if @booking.update(instructor_id: params[:room_booking][:instructor_id])
-      flash[:notice] = "Instructor updated successfully."
+      flash[:notice] = 'Instructor updated successfully.'
     else
-      flash[:alert] = "Failed to update instructor."
+      flash[:alert] = 'Failed to update instructor.'
     end
-    
+
     # Redirect to the previous page or another relevant page
     redirect_back(fallback_location: room_bookings_path)
   end
diff --git a/app/helpers/room_bookings_helper.rb b/app/helpers/room_bookings_helper.rb
index f3fe468..4c364c0 100644
--- a/app/helpers/room_bookings_helper.rb
+++ b/app/helpers/room_bookings_helper.rb
@@ -2,11 +2,11 @@
 
 # Room Bookings Helper
 module RoomBookingsHelper
-    def available_sections schedule
-        @sections = Section.joins(:course)
-         .where(courses: { schedule_id: schedule.id })
-         .left_joins(:room_booking)
-         .where(room_booking: { id: nil })
-        render partial: '/shared/courses_list', locals: { sections: @sections }
-    end
+  def available_sections(schedule)
+    @sections = Section.joins(:course)
+                       .where(courses: { schedule_id: schedule.id })
+                       .left_joins(:room_booking)
+                       .where(room_booking: { id: nil })
+    render partial: '/shared/courses_list', locals: { sections: @sections }
+  end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 9b9ac8c..0ce1fe0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -41,13 +41,12 @@
 
     get '/time_slots', to: 'time_slots#index'
 
-    resources :room_bookings, only: [:index, :create, :destroy] do
+    resources :room_bookings, only: %i[index create destroy] do
       member do
         patch :toggle_lock
         patch :update_instructor
       end
     end
-    
   end
 
   # Show Time Slot View
diff --git a/db/migrate/20241031023936_add_instructor_ref_to_room_bookings.rb b/db/migrate/20241031023936_add_instructor_ref_to_room_bookings.rb
index 2ea15fd..11417d2 100644
--- a/db/migrate/20241031023936_add_instructor_ref_to_room_bookings.rb
+++ b/db/migrate/20241031023936_add_instructor_ref_to_room_bookings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddInstructorRefToRoomBookings < ActiveRecord::Migration[7.2]
   def change
     add_reference :room_bookings, :instructor, null: false, foreign_key: true
diff --git a/db/migrate/20241031203245_change_instructor_id_in_room_bookings_to_nullable.rb b/db/migrate/20241031203245_change_instructor_id_in_room_bookings_to_nullable.rb
index 66415b1..f93781c 100644
--- a/db/migrate/20241031203245_change_instructor_id_in_room_bookings_to_nullable.rb
+++ b/db/migrate/20241031203245_change_instructor_id_in_room_bookings_to_nullable.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ChangeInstructorIdInRoomBookingsToNullable < ActiveRecord::Migration[7.2]
   def change
     change_column_null :room_bookings, :instructor_id, true
diff --git a/db/migrate/20241031204719_add_section_to_room_bookings.rb b/db/migrate/20241031204719_add_section_to_room_bookings.rb
index 18045d6..b36579b 100644
--- a/db/migrate/20241031204719_add_section_to_room_bookings.rb
+++ b/db/migrate/20241031204719_add_section_to_room_bookings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddSectionToRoomBookings < ActiveRecord::Migration[7.2]
   def change
     add_reference :room_bookings, :section, foreign_key: true
diff --git a/db/migrate/20241101020805_add_is_locked_to_room_bookings.rb b/db/migrate/20241101020805_add_is_locked_to_room_bookings.rb
index 0a9e316..7fda6d5 100644
--- a/db/migrate/20241101020805_add_is_locked_to_room_bookings.rb
+++ b/db/migrate/20241101020805_add_is_locked_to_room_bookings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddIsLockedToRoomBookings < ActiveRecord::Migration[7.2]
   def change
     add_column :room_bookings, :is_locked, :boolean
diff --git a/db/schema.rb b/db/schema.rb
index 27e2ced..dfdf04a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -10,120 +12,120 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2024_11_01_020805) do
-  create_table "courses", force: :cascade do |t|
-    t.string "course_number"
-    t.integer "max_seats"
-    t.string "lecture_type"
-    t.integer "num_labs"
-    t.integer "schedule_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["schedule_id"], name: "index_courses_on_schedule_id"
+ActiveRecord::Schema[7.2].define(version: 20_241_101_020_805) do
+  create_table 'courses', force: :cascade do |t|
+    t.string 'course_number'
+    t.integer 'max_seats'
+    t.string 'lecture_type'
+    t.integer 'num_labs'
+    t.integer 'schedule_id', null: false
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
+    t.index ['schedule_id'], name: 'index_courses_on_schedule_id'
   end
 
-  create_table "instructor_preferences", force: :cascade do |t|
-    t.integer "instructor_id", null: false
-    t.integer "preference_level"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "course_id", null: false
-    t.index ["course_id"], name: "index_instructor_preferences_on_course_id"
-    t.index ["instructor_id"], name: "index_instructor_preferences_on_instructor_id"
+  create_table 'instructor_preferences', force: :cascade do |t|
+    t.integer 'instructor_id', null: false
+    t.integer 'preference_level'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
+    t.integer 'course_id', null: false
+    t.index ['course_id'], name: 'index_instructor_preferences_on_course_id'
+    t.index ['instructor_id'], name: 'index_instructor_preferences_on_instructor_id'
   end
 
-  create_table "instructors", force: :cascade do |t|
-    t.integer "id_number"
-    t.string "last_name"
-    t.string "first_name"
-    t.string "middle_name"
-    t.string "email"
-    t.boolean "before_9"
-    t.boolean "after_3"
-    t.text "beaware_of"
-    t.integer "schedule_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "max_course_load"
-    t.index ["schedule_id"], name: "index_instructors_on_schedule_id"
+  create_table 'instructors', force: :cascade do |t|
+    t.integer 'id_number'
+    t.string 'last_name'
+    t.string 'first_name'
+    t.string 'middle_name'
+    t.string 'email'
+    t.boolean 'before_9'
+    t.boolean 'after_3'
+    t.text 'beaware_of'
+    t.integer 'schedule_id'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
+    t.integer 'max_course_load'
+    t.index ['schedule_id'], name: 'index_instructors_on_schedule_id'
   end
 
-  create_table "room_bookings", force: :cascade do |t|
-    t.integer "room_id", null: false
-    t.integer "time_slot_id", null: false
-    t.boolean "is_available"
-    t.boolean "is_lab"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "instructor_id"
-    t.integer "section_id"
-    t.boolean "is_locked"
-    t.index ["instructor_id"], name: "index_room_bookings_on_instructor_id"
-    t.index ["room_id"], name: "index_room_bookings_on_room_id"
-    t.index ["section_id"], name: "index_room_bookings_on_section_id"
-    t.index ["time_slot_id"], name: "index_room_bookings_on_time_slot_id"
+  create_table 'room_bookings', force: :cascade do |t|
+    t.integer 'room_id', null: false
+    t.integer 'time_slot_id', null: false
+    t.boolean 'is_available'
+    t.boolean 'is_lab'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
+    t.integer 'instructor_id'
+    t.integer 'section_id'
+    t.boolean 'is_locked'
+    t.index ['instructor_id'], name: 'index_room_bookings_on_instructor_id'
+    t.index ['room_id'], name: 'index_room_bookings_on_room_id'
+    t.index ['section_id'], name: 'index_room_bookings_on_section_id'
+    t.index ['time_slot_id'], name: 'index_room_bookings_on_time_slot_id'
   end
 
-  create_table "rooms", force: :cascade do |t|
-    t.integer "campus"
-    t.boolean "is_lecture_hall"
-    t.boolean "is_learning_studio"
-    t.boolean "is_lab"
-    t.string "building_code"
-    t.string "room_number"
-    t.integer "capacity"
-    t.boolean "is_active"
-    t.string "comments"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "schedule_id", default: -1, null: false
-    t.index ["schedule_id"], name: "index_rooms_on_schedule_id"
+  create_table 'rooms', force: :cascade do |t|
+    t.integer 'campus'
+    t.boolean 'is_lecture_hall'
+    t.boolean 'is_learning_studio'
+    t.boolean 'is_lab'
+    t.string 'building_code'
+    t.string 'room_number'
+    t.integer 'capacity'
+    t.boolean 'is_active'
+    t.string 'comments'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
+    t.integer 'schedule_id', default: -1, null: false
+    t.index ['schedule_id'], name: 'index_rooms_on_schedule_id'
   end
 
-  create_table "schedules", force: :cascade do |t|
-    t.string "schedule_name"
-    t.string "semester_name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'schedules', force: :cascade do |t|
+    t.string 'schedule_name'
+    t.string 'semester_name'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 
-  create_table "sections", force: :cascade do |t|
-    t.string "section_number"
-    t.integer "seats_alloted"
-    t.integer "course_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["course_id"], name: "index_sections_on_course_id"
+  create_table 'sections', force: :cascade do |t|
+    t.string 'section_number'
+    t.integer 'seats_alloted'
+    t.integer 'course_id', null: false
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
+    t.index ['course_id'], name: 'index_sections_on_course_id'
   end
 
-  create_table "time_slots", force: :cascade do |t|
-    t.string "day"
-    t.string "start_time"
-    t.string "end_time"
-    t.string "slot_type"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  create_table 'time_slots', force: :cascade do |t|
+    t.string 'day'
+    t.string 'start_time'
+    t.string 'end_time'
+    t.string 'slot_type'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
   end
 
-  create_table "users", force: :cascade do |t|
-    t.string "email"
-    t.string "first_name"
-    t.string "last_name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.string "uid"
-    t.string "provider"
-    t.index ["email"], name: "index_users_on_email", unique: true
+  create_table 'users', force: :cascade do |t|
+    t.string 'email'
+    t.string 'first_name'
+    t.string 'last_name'
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
+    t.string 'uid'
+    t.string 'provider'
+    t.index ['email'], name: 'index_users_on_email', unique: true
   end
 
-  add_foreign_key "courses", "schedules"
-  add_foreign_key "instructor_preferences", "courses"
-  add_foreign_key "instructor_preferences", "instructors"
-  add_foreign_key "instructors", "schedules"
-  add_foreign_key "room_bookings", "instructors"
-  add_foreign_key "room_bookings", "rooms"
-  add_foreign_key "room_bookings", "sections"
-  add_foreign_key "room_bookings", "time_slots"
-  add_foreign_key "rooms", "schedules"
-  add_foreign_key "sections", "courses"
+  add_foreign_key 'courses', 'schedules'
+  add_foreign_key 'instructor_preferences', 'courses'
+  add_foreign_key 'instructor_preferences', 'instructors'
+  add_foreign_key 'instructors', 'schedules'
+  add_foreign_key 'room_bookings', 'instructors'
+  add_foreign_key 'room_bookings', 'rooms'
+  add_foreign_key 'room_bookings', 'sections'
+  add_foreign_key 'room_bookings', 'time_slots'
+  add_foreign_key 'rooms', 'schedules'
+  add_foreign_key 'sections', 'courses'
 end
diff --git a/features/room_bookings.feature b/features/room_bookings.feature
index ccbdf0a..69cf090 100644
--- a/features/room_bookings.feature
+++ b/features/room_bookings.feature
@@ -50,4 +50,99 @@ Feature: Rooms Page
         When I visit the room bookings page for "Sched 1"
         Then I should see "Back to Schedules"
         When I click "Back to Schedules"
-        Then I should be on the schedules page
\ No newline at end of file
+        Then I should be on the schedules page
+
+    Scenario: User should be able to create a room booking
+        Given I am logged in as a user with first name "Test"
+        And a schedule exists with the schedule name "Sched 1" and semester name "Fall 2024"
+        And the following rooms exist for that schedule:
+        | campus    | building_code | room_number | capacity | is_active | is_lab   | is_learning_studio    | is_lecture_hall   |
+        | CS        | BLDG1         | 101         | 30       | true      | true     | true                  | true              |
+        | GV        | BLDG2         | 102         | 50       | true      | true     | true                  | true              |
+        | CS        | BLDG3         | 102         | 50       | false     | true     | true                  | true              |
+        And the following time slots exist for that schedule:
+        | day       | start_time    | end_time      | slot_type     |
+        | MWF       | 09:00         | 10:00         | "LEC"         |
+        | MW        | 08:00         | 10:00         | "LEC"         |
+        And the following courses and their sections exist:
+        | course_number       | max_seats | lecture_type | num_labs         | sections      |
+        | 110                 | 96        | F2F          | 4                | 100,101       |
+        | 110                 | 96        | F2F          | 4                | 100     |
+        | 111                 | 96        | F2F          | 4                | 100       |
+        | 435/735/735D        | 135       | F2F          | 2                | 100      |
+        When I visit the room bookings page for "Sched 1"
+        And I book room "BLDG1" "101" in "MWF" for "09:00 - 10:00" with "100" for "110"
+        Then I should see "Unlocked"
+    
+    Scenario: User should be able to delete a room booking
+        Given I am logged in as a user with first name "Test"
+        And a schedule exists with the schedule name "Sched 1" and semester name "Fall 2024"
+        And the following rooms exist for that schedule:
+        | campus    | building_code | room_number | capacity | is_active | is_lab   | is_learning_studio    | is_lecture_hall   |
+        | CS        | BLDG1         | 101         | 30       | true      | true     | true                  | true              |
+        | GV        | BLDG2         | 102         | 50       | true      | true     | true                  | true              |
+        | CS        | BLDG3         | 102         | 50       | false     | true     | true                  | true              |
+        And the following time slots exist for that schedule:
+        | day       | start_time    | end_time      | slot_type     |
+        | MWF       | 09:00         | 10:00         | "LEC"         |
+        | MW        | 08:00         | 10:00         | "LEC"         |
+        And the following courses and their sections exist:
+        | course_number       | max_seats | lecture_type | num_labs         | sections      |
+        | 110                 | 96        | F2F          | 4                | 100,101       |
+        | 110                 | 96        | F2F          | 4                | 100     |
+        | 111                 | 96        | F2F          | 4                | 100       |
+        | 435/735/735D        | 135       | F2F          | 2                | 100      |
+        When I visit the room bookings page for "Sched 1"
+        And I book room "BLDG1" "101" in "MWF" for "09:00 - 10:00" with "100" for "110"
+        And I click "Delete"
+        Then I should not see "Unlocked"
+    
+    Scenario: User should be able to lock a room booking
+        Given I am logged in as a user with first name "Test"
+        And a schedule exists with the schedule name "Sched 1" and semester name "Fall 2024"
+        And the following rooms exist for that schedule:
+        | campus    | building_code | room_number | capacity | is_active | is_lab   | is_learning_studio    | is_lecture_hall   |
+        | CS        | BLDG1         | 101         | 30       | true      | true     | true                  | true              |
+        | GV        | BLDG2         | 102         | 50       | true      | true     | true                  | true              |
+        | CS        | BLDG3         | 102         | 50       | false     | true     | true                  | true              |
+        And the following time slots exist for that schedule:
+        | day       | start_time    | end_time      | slot_type     |
+        | MWF       | 09:00         | 10:00         | "LEC"         |
+        | MW        | 08:00         | 10:00         | "LEC"         |
+        And the following courses and their sections exist:
+        | course_number       | max_seats | lecture_type | num_labs         | sections      |
+        | 110                 | 96        | F2F          | 4                | 100,101       |
+        | 110                 | 96        | F2F          | 4                | 100     |
+        | 111                 | 96        | F2F          | 4                | 100       |
+        | 435/735/735D        | 135       | F2F          | 2                | 100      |
+        When I visit the room bookings page for "Sched 1"
+        And I book room "BLDG1" "101" in "MWF" for "09:00 - 10:00" with "100" for "110"
+        And I click "Unlocked"
+        Then I should not see "Unlocked"
+        And I should see "Locked"
+
+    Scenario: User should be able to assign instructors to a room booking
+        Given I am logged in as a user with first name "Test"
+        And a schedule exists with the schedule name "Sched 1" and semester name "Fall 2024"
+        And the following rooms exist for that schedule:
+        | campus    | building_code | room_number | capacity | is_active | is_lab   | is_learning_studio    | is_lecture_hall   |
+        | CS        | BLDG1         | 101         | 30       | true      | true     | true                  | true              |
+        | GV        | BLDG2         | 102         | 50       | true      | true     | true                  | true              |
+        | CS        | BLDG3         | 102         | 50       | false     | true     | true                  | true              |
+        And the following time slots exist for that schedule:
+        | day       | start_time    | end_time      | slot_type     |
+        | MWF       | 09:00         | 10:00         | "LEC"         |
+        | MW        | 08:00         | 10:00         | "LEC"         |
+        And the following courses and their sections exist:
+        | course_number       | max_seats | lecture_type | num_labs         | sections      |
+        | 110                 | 96        | F2F          | 4                | 100,101       |
+        | 110                 | 96        | F2F          | 4                | 100     |
+        | 111                 | 96        | F2F          | 4                | 100       |
+        | 435/735/735D        | 135       | F2F          | 2                | 100      |
+        And the following instructors exist:
+        | id_number | first_name | last_name | middle_name | email            | before_9    | after_3  | beaware_of |
+        | 1001      | John       | Doe       | A           | john@example.com | true        | false    | test       |
+        | 1002      | Jane       | Smith     | B           | jane@example.com | false       | false    |            |
+        When I visit the room bookings page for "Sched 1"
+        And I book room "BLDG1" "101" in "MWF" for "09:00 - 10:00" with "100" for "110"
+        Then I should see "Unlocked"
\ No newline at end of file
diff --git a/features/step_definitions/room_bookings_steps.rb b/features/step_definitions/room_bookings_steps.rb
index 51ea5e3..27a9f35 100644
--- a/features/step_definitions/room_bookings_steps.rb
+++ b/features/step_definitions/room_bookings_steps.rb
@@ -5,6 +5,30 @@
   visit schedule_room_bookings_path(@schedule)
 end
 
+Given(/^the following courses and their sections exist:$/) do |table|
+  table.hashes.each do |row|
+    # Create the course with the given name
+    course = Course.create!(
+      course_number: row['course_number'],
+      max_seats: row['max_seats'],
+      lecture_type: row['lecture_type'],
+      num_labs: row['num_labs'],
+
+      schedule: @schedule
+    )
+
+    # Create sections associated with the course
+    row['sections'].split(',').each do |section_name|
+      section_data = {
+        course_id: course.id,
+        section_number: section_name,
+        seats_alloted: 24
+      }
+      Section.create!(section_data)
+    end
+  end
+end
+
 When(/^I visit the room bookings page for "(.*)"$/) do |schedule_name|
   @schedule = Schedule.where(schedule_name:)[0]
   visit schedule_room_bookings_path(schedule_id: @schedule.id)
@@ -20,3 +44,53 @@
     )
   end
 end
+
+When(/^I click on a the booking table in "(.*)" for "(.*)" in "(.*)" "(.*)"$/) do |day, time, bldg, room|
+  # Find the room based on schedule and building code
+  room = @schedule.rooms.find_by(building_code: bldg, room_number: room)
+  expect(room).not_to be_nil, 'Could not find room'
+
+  # Find the time slot based on day and time
+  start_time, end_time = time.split(' - ')
+  time_slot = TimeSlot.find_by(day:, start_time:, end_time:)
+  expect(time_slot).not_to be_nil, "Could not find time slot for '#{day} #{time}'"
+
+  # Locate and click on the cell
+  cell = find("td.table-cell[data-room-id='#{room.id}'][data-time-slot-id='#{time_slot.id}']")
+  cell.click
+
+  button = find('a.btn.btn-primary.course-select-btn', match: :first)
+  expect(button.href).contain(room.id)
+end
+
+When(/^I click the select "(.*)" for "(.*)"$/) do |section_number, course_number|
+  # Find the button using the section number
+  course = @schedule.courses.find_by(course_number:)
+  section = Section.find_by(course_id: course.id, section_number:)
+  button = find("a.btn.btn-primary.course-select-btn[data-section='#{section.id}']", match: :first)
+  button.click
+end
+
+When(/^I book room "(.*)" "(.*)" in "(.*)" for "(.*)" with "(.*)" for "(.*)"$/) do |bldg, room, day, time, section_number, course_number|
+  # Find the room based on schedule and building code
+  room = @schedule.rooms.find_by(building_code: bldg, room_number: room)
+  expect(room).not_to be_nil, 'Could not find room'
+
+  # Find the time slot based on day and time
+  start_time, end_time = time.split(' - ')
+  time_slot = TimeSlot.find_by(day:, start_time:, end_time:)
+  expect(time_slot).not_to be_nil, "Could not find time slot for '#{day} #{time}'"
+
+  course = @schedule.courses.find_by(course_number:)
+  section = Section.find_by(course_id: course.id, section_number:)
+
+  page.driver.post room_bookings_path(schedule_id: @schedule.id), {
+    room_booking: {
+      room_id: room.id,
+      time_slot_id: time_slot.id,
+      section_id: section.id
+    }
+  }
+
+  visit schedule_room_bookings_path(schedule_id: @schedule.id)
+end
diff --git a/spec/controllers/room_bookings_controller_spec.rb b/spec/controllers/room_bookings_controller_spec.rb
index ebb058e..ce9173f 100644
--- a/spec/controllers/room_bookings_controller_spec.rb
+++ b/spec/controllers/room_bookings_controller_spec.rb
@@ -10,10 +10,10 @@
   let!(:room2) { create(:room, schedule:) }
   let!(:time_slot1) { create(:time_slot, day: 'Monday', start_time: '09:00', end_time: '10:00') }
   let!(:time_slot2) { create(:time_slot, day: 'Monday', start_time: '10:00', end_time: '11:00') }
-  let(:course) { create(:course, schedule: schedule) }
-  let(:section) { create(:section, course: course) }
-  let!(:room_booking1) { create(:room_booking, room: room1, time_slot: time_slot1, section: section, is_available: true) }
-  let!(:room_booking2) { create(:room_booking, room: room2, time_slot: time_slot2, section: section, is_available: false) }
+  let(:course) { create(:course, schedule:) }
+  let(:section) { create(:section, course:) }
+  let!(:room_booking1) { create(:room_booking, room: room1, time_slot: time_slot1, section:, is_available: true) }
+  let!(:room_booking2) { create(:room_booking, room: room2, time_slot: time_slot2, section:, is_available: false) }
   let(:instructor) { create(:instructor) }
 
   before do
@@ -69,7 +69,7 @@
         }
 
         expect(RoomBooking.count).to eq(3)
-        expect(flash[:notice]).to eq("Movie was successfully created.")
+        expect(flash[:notice]).to eq('Movie was successfully created.')
         expect(response).to redirect_to(schedule_room_bookings_path(schedule))
       end
     end
@@ -80,14 +80,14 @@
       delete :destroy, params: { schedule_id: schedule.id, id: room_booking1.id }
 
       expect(RoomBooking.exists?(room_booking1.id)).to be_falsey
-      expect(flash[:notice]).to eq("Room booking deleted successfully.")
+      expect(flash[:notice]).to eq('Room booking deleted successfully.')
       expect(response).to redirect_to(schedule_room_bookings_path(schedule))
     end
 
     it 'renders an error when room booking does not exist' do
-      delete :destroy, params: { schedule_id: schedule.id, id: 999 }  # Non-existent room_booking ID
+      delete :destroy, params: { schedule_id: schedule.id, id: 999 } # Non-existent room_booking ID
 
-      expect(flash[:alert]).to eq("Room booking not found.")
+      expect(flash[:alert]).to eq('Room booking not found.')
       expect(response).to redirect_to(schedule_room_bookings_path(schedule))
     end
   end
@@ -99,7 +99,7 @@
 
       room_booking1.reload
       expect(room_booking1.is_locked).to be_truthy
-      expect(flash[:notice]).to eq("Room booking lock status updated successfully.")
+      expect(flash[:notice]).to eq('Room booking lock status updated successfully.')
     end
   end
 
@@ -114,18 +114,18 @@
 
       room_booking1.reload
       expect(room_booking1.instructor).to eq(another_instructor)
-      expect(flash[:notice]).to eq("Instructor updated successfully.")
+      expect(flash[:notice]).to eq('Instructor updated successfully.')
     end
 
     it 'renders an error message when update fails' do
-      allow_any_instance_of(RoomBooking).to receive(:update).and_return(false)  # Force failure
+      allow_any_instance_of(RoomBooking).to receive(:update).and_return(false) # Force failure
       patch :update_instructor, params: {
         schedule_id: schedule.id,
         id: room_booking1.id,
         room_booking: { instructor_id: nil }
       }
 
-      expect(flash[:alert]).to eq("Failed to update instructor.")
+      expect(flash[:alert]).to eq('Failed to update instructor.')
     end
   end
 end