GPRS and CALENDAR

vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb

@@ -58,7 +58,7 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
 	def get_events
 		month = params[:month]
 		year = params[:year]
-		events = Event.where(:start_month => month).and(:start_year => year)
+		events = Event.where(:start_month => month).and(:start_year => year).asc(:start_date)
 		@events = Array.new
 		events.each do |event|
 			# @temp = Array.new
@@ -66,8 +66,9 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
 			no_of_days = no_of_days.to_i
 			no_of_days += 1
 			color = Cal.find(event.cal_id).color
-			@events << {"start_date"=>event.start_date, "total_days" => no_of_days, "title" => event.title,"color"=>color}
+			@events << {"start_date"=>event.start_date, "total_days" => no_of_days, "title" => event.title,"color"=>color,"show_link"=>panel_calendar_back_end_event_path(event)}
 		end
+		@events = @events.sort{|k,v| v[:total_days] <=> k[:total_days]}
 		render :json => @events.to_json
 	end
 	

vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb

@@ -1,5 +1,5 @@
 class Panel::Calendar::BackEnd::EventsController < OrbitBackendController
-
+	include Panel::Calendar::BackEnd::CalsHelper
 	def new
 		@calendars = Cal.all
 		@event = Event.new
@@ -55,4 +55,14 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController
 			h.js
 		end
 	end
-end
+	def show
+		@event = Event.find(params[:id])
+		@start_month_name = Date::ABBR_MONTHNAMES[@event.start_month]
+		@end_month_name = Date::ABBR_MONTHNAMES[@event.end_month]
+		@start_day_name = getDayName(@event.start_date,@event.start_month,@event.start_year)
+		@end_day_name = getDayName(@event.end_date,@event.end_month,@event.end_year)
+		render :layout=>false
+	end
+end
+
+