Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed.

vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb

@@ -51,7 +51,14 @@ var calendarAPI = function(){
 			// c.loadMonthView(c.cur_month,c.cur_year);
 			// c.loadWeekView(c.cur_week,c.cur_year);
 			// c.loadDayView(c.cur_date,c.cur_month,c.cur_year);
-			c.loadAgendaView();
+			agenda_end_month = c.cur_month + 5;
+			agenda_end_year = c.cur_year;
+			if(agenda_end_month > 12){
+				agenda_end_month = agenda_end_month - 12;
+				agenda_end_year++;
+			}
+
+			c.loadAgendaView(c.cur_month,c.cur_year,agenda_end_month,agenda_end_year);
 			$(".calendar-filter-btn").each(function(){
 				c.calendars.push($(this).attr("href"));
 			})
@@ -130,7 +137,7 @@ var calendarAPI = function(){
 						c.loadDayView(c.cur_date,c.cur_month,c.cur_year);
 					break;
 					case 'agenda':
-						c.loadAgendaView();
+						c.loadAgendaView(c.cur_month,c.cur_year,agenda_end_month,agenda_end_year);
 					break;
 				}
 			})
@@ -591,6 +598,8 @@ var calendarAPI = function(){
 	this.loadAgendaView = function(start_month,start_year,end_month,end_year){
 		c.view = "agenda";
 		var url = "cals/agenda_view";
+		$(".mode_switch").removeClass("active");
+		$(".mode_switch:eq(3)").addClass("active");
 		if(start_month && start_year && end_month && end_year)
 			var url = "cals/agenda_view?s_month="+start_month+"&s_year="+start_year+"&e_month="+end_month+"&e_year="+end_year ;
 

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

@@ -190,7 +190,8 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
 						end
 						display_time = est + " " + event.start_am_pm + " - " + eet + " " + event.end_am_pm
 					end
-					 for c in start_date..(start_date + no_of_days)
+					
+					 for c in start_date..(start_date + no_of_days - 1)
 					 	if h.index(c) == nil
 					 		h << c
 					 	end 
@@ -296,7 +297,7 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
 		year = params[:year].to_i
 		fromcalendars = params[:calendars]
 		@d = getWeekDataSet(week,year)
-		events = Event.where(:cal_id.in=>fromcalendars).and(:start_week.lte => week).and(:start_year => year).and(:end_week.gte => week).and(:start_year => year).asc(:start_week).asc(:start_date)
+		events = Event.where(:cal_id.in=>fromcalendars).and(:start_week.lte => week).and(:start_year => year).and(:end_week.gte => week).asc(:start_week).asc(:start_date)
 		@events = Array.new
 		events.each_with_index do |event,i|
 			# @temp = Array.new
@@ -335,7 +336,7 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
 				startdt = @d[0].to_i
 				event.all_day = true
 				if event.end_week == week
-					colcount = 7 - @d.index(event.end_date.to_s).to_i
+					colcount = @d.index(event.end_date.to_s).to_i + 1
 					days = 7;
 					startdt = event.start_date
 				end

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

@@ -90,7 +90,10 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController
 		final_start_time = Date.new(start_year.to_i,start_month.to_i,start_date.to_i)
 		final_end_time = Date.new(end_year.to_i,end_month.to_i,end_date.to_i)
 		start_week = final_start_time.strftime("%U")
-		end_week = final_end_time.strftime("%U")		
+		start_week = start_week.to_i + 1
+		end_week = final_end_time.strftime("%U")
+		end_week = end_week.to_i + 1
+		debugger
 		total_days = final_end_time - final_start_time
 		@event = Event.new
 		@event.title = title