From 3608f70d11f9347698e23b933563438029da14d2 Mon Sep 17 00:00:00 2001
From: Sean Kenny <srkenny@gmail.com>
Date: Sat, 13 Sep 2014 18:34:18 +0100
Subject: [PATCH] display the all day events only on correct date

---
 demos/resource-views.html       | 43 +++++++++++++++++++++++++++++++--
 src/resource/ResourceDayGrid.js | 33 +++++++++++++------------
 src/resource/ResourceView.js    | 24 +++---------------
 tests/resourceDayView.html      | 18 ++++++++------
 4 files changed, 73 insertions(+), 45 deletions(-)

diff --git a/demos/resource-views.html b/demos/resource-views.html
index 53fecda..e60a7f6 100644
--- a/demos/resource-views.html
+++ b/demos/resource-views.html
@@ -30,9 +30,48 @@
       background-color: rgb(255, 190, 190);
     }
   </style>
-  <script src='../lib/moment/moment.js'></script>
+  <!--<script src='../lib/moment/moment.js'></script>
   <script src='../lib/jquery/dist/jquery.js'></script>
-  <script src='../dist/fullcalendar.js'></script>
+  <script src='../dist/fullcalendar.js'></script>-->
+  <script src='../lib/jquery/dist/jquery.js'></script>
+    <script src='../lib/moment/moment.js'></script>
+    <script src='../src/defaults.js'></script>
+    <script src='../src/main.js'></script>
+    <script src='../src/lang.js'></script>
+    <script src='../src/Calendar.js'></script>
+    <script src='../src/Header.js'></script>
+    <script src='../src/EventManager.js'></script>
+    <script src='../src/ResourceManager.js'></script>
+    <script src='../src/util.js'></script>
+    <script src='../src/moment-ext.js'></script>
+    <script src='../src/date-formatting.js'></script>
+    <script src='../src/common/Popover.js'></script>
+    <script src='../src/common/CoordMap.js'></script>
+    <script src='../src/common/DragListener.js'></script>
+    <script src='../src/common/MouseFollower.js'></script>
+    <script src='../src/common/RowRenderer.js'></script>
+    <script src='../src/common/Grid.js'></script>
+    <script src='../src/common/Grid.events.js'></script>
+    <script src='../src/common/DayGrid.js'></script>
+    <script src='../src/common/DayGrid.events.js'></script>
+    <script src='../src/common/DayGrid.limit.js'></script>
+    <script src='../src/common/TimeGrid.js'></script>
+    <script src='../src/common/TimeGrid.events.js'></script>
+    <script src='../src/resource/ResourceTimeGrid.js'></script>
+    <script src='../src/resource/ResourceTimeGrid.events.js'></script>
+    <script src='../src/resource/ResourceDayGrid.js'></script>
+    <script src='../src/resource/ResourceDayGrid.events.js'></script>
+    <script src='../src/common/View.js'></script>
+    <script src='../src/basic/BasicView.js'></script>
+    <script src='../src/basic/MonthView.js'></script>
+    <script src='../src/basic/BasicWeekView.js'></script>
+    <script src='../src/basic/BasicDayView.js'></script>
+    <script src='../src/agenda/AgendaView.js'></script>
+    <script src='../src/agenda/AgendaWeekView.js'></script>
+    <script src='../src/agenda/AgendaDayView.js'></script>
+    <script src='../src/resource/ResourceView.js'></script>
+    <script src='../src/resource/ResourceDayView.js'></script>
+    
   <script>
 
     $(document).ready(function () {
diff --git a/src/resource/ResourceDayGrid.js b/src/resource/ResourceDayGrid.js
index b6d739f..0449963 100644
--- a/src/resource/ResourceDayGrid.js
+++ b/src/resource/ResourceDayGrid.js
@@ -10,21 +10,24 @@ function ResourceDayGrid(view) {
 ResourceDayGrid.prototype = createObject(DayGrid.prototype); // declare the super-class
 $.extend(ResourceDayGrid.prototype, {
 	rangeToSegs: function(rangeStart, rangeEnd, resourceIds) {
-		var segments = []; 
-		var view = this.view;
-
-		var resources = view.calendar.fetchResources();
-	
-		for (col = 0; col < view.colCnt; col++) {
-      var resource = resources[col];
-      if (resourceIds.indexOf(resource.id) > -1){
-				segments.push({
-					row: 0,
-					leftCol: col,
-					rightCol: col,
-					isStart: true,
-					isEnd: true
-				});
+		var col, segments = [];
+		
+		var currentDate = this.view.calendar.getDate();
+		if((rangeStart <= currentDate) && (currentDate < rangeEnd)) {
+			var view = this.view;
+			var resources = view.calendar.fetchResources();
+		
+			for (col = 0; col < view.colCnt; col++) {
+	      var resource = resources[col];
+	      if (resourceIds.indexOf(resource.id) > -1){
+					segments.push({
+						row: 0,
+						leftCol: col,
+						rightCol: col,
+						isStart: true,
+						isEnd: true
+					});
+				}
 			}
 		}
 
diff --git a/src/resource/ResourceView.js b/src/resource/ResourceView.js
index 3060681..29ff9f4 100644
--- a/src/resource/ResourceView.js
+++ b/src/resource/ResourceView.js
@@ -22,23 +22,6 @@ setDefaults({
 	slotEventOverlap: true
 });
 
-var AGENDA_ALL_DAY_EVENT_LIMIT = 5;
-
-
-function generateAgendaAxisFormat(options, langData) {
-	return langData.longDateFormat('LT')
-		.replace(':mm', '(:mm)')
-		.replace(/(\Wmm)$/, '($1)') // like above, but for foreign langs
-		.replace(/\s*a$/i, 'a'); // convert AM/PM/am/pm to lowercase. remove any spaces beforehand
-}
-
-
-function generateAgendaTimeFormat(options, langData) {
-	return langData.longDateFormat('LT')
-		.replace(/\s*a$/i, ''); // remove trailing AM/PM
-}
-
-
 function ResourceView(calendar) {
 	View.call(this, calendar); // call the super-constructor
 
@@ -73,12 +56,11 @@ $.extend(ResourceView.prototype, {
 	headCellHtml: function(row, col, date) {
 		var view = this;
 		var calendar = view.calendar;
-		var colFormat = view.opt('columnFormat');
-		var resource = this.calendar.fetchResources()[col];
+		var resource = calendar.fetchResources()[col];
 		return '' +
 			'<th class="fc-day-header ' + view.widgetHeaderClass + ' fc-' + resource.id + '">' +
-				htmlEscape(resource.name) + 
+				htmlEscape(resource.name) +
 			'</th>';
-	}	
+	}
 
 });
diff --git a/tests/resourceDayView.html b/tests/resourceDayView.html
index 7aca45e..a7af103 100644
--- a/tests/resourceDayView.html
+++ b/tests/resourceDayView.html
@@ -59,12 +59,6 @@
                 selectable: true,
                 selectHelper: true,
                 allDaySlot: true,
-                eventDrop: function (event, delta, revertFunc) {
-                  //revertFunc();
-                },
-                eventResize: function (event, delta, revertFunc) {
-                  //revertFunc();
-                },
                 // weekends: false,
                 header: {
                     left: 'prev,next today',
@@ -110,7 +104,17 @@
                       allDay: false,
                       resources: ['resource2']
                   }
-                ]
+                ],
+                eventDrop: function(event, delta, revertFunc) {
+                  if (!confirm("Are you sure about this change?")) {
+                    revertFunc();
+                  }
+                },
+                eventResize: function (event, delta, revertFunc) {
+                  if (!confirm("Are you sure about this change?")) {
+                    revertFunc();
+                  }
+                }
             });
         });