Merge branch '9-napraviti-lako-filtriranje-timova-na-kalendaru' into 'master'

Merge branch '8-podrska-za-boje-na-kalendaru' into 'master'

Closes #8 and #9

See merge request kbr4/zsterminator!7

app/controllers/application_controller.rb

@@ -14,8 +14,21 @@ class ApplicationController < ActionController::Base
   end
 
   def set_company
-    company_id = session.fetch(:company_id, Company.first&.id)
-    session[:company_id] = company_id
-    @company = Company.find(session[:company_id])
+    # This should be handled by your authentication system
+    # But for now, we'll use a placeholder
+    company_id = session[:company_id]
+    
+    unless company_id && Company.exists?(company_id)
+      # If no company in session or it doesn't exist, use the first company
+      company_id = Company.first&.id
+      session[:company_id] = company_id
+    end
+    
+    @company = Company.find(company_id) if company_id
   end
+  
+  def current_company
+    @company
+  end
+  helper_method :current_company
 end

app/controllers/reservations_controller.rb

@@ -204,4 +204,16 @@ class ReservationsController < ApplicationController
     @reservation.customer_surname = @customer.surname
     @reservation.customer_original_phone = @customer.original_phone
   end
+
+  # Override the application controller method to include teams
+  def set_company
+    company_id = session[:company_id]
+    
+    unless company_id && Company.exists?(company_id)
+      company_id = Company.first&.id
+      session[:company_id] = company_id
+    end
+    
+    @company = Company.includes(:teams).find(company_id) if company_id
+  end
 end