Changeset 4046 for ssme/trunk/flex/Calendar/src/com/kh/ssme/components/MonthCanvas.as

Timestamp:

08/23/10 12:21:43 (21 months ago)

Author:

mszopinski

Message:

calendar, month display

Files:

• ssme/trunk/flex/Calendar/src/com/kh/ssme/components/MonthCanvas.as (modified) (3 diffs)

ssme/trunk/flex/Calendar/src/com/kh/ssme/components/MonthCanvas.as

@@ -92 +92 @@
                 monthBeginDay = (new DateUtil(value)).monthBegin();
                 var nextMonthBegin:DateUtil = monthBeginDay.clone().add(DateProperty.MONTH, 1);
-                monthEndDay = nextMonthBegin.clone().sub(DateProperty.DATE, 1);
+                monthEndDay = nextMonthBegin.clone().dayEnd();
 
                 numberOfDays = nextMonthBegin.diff( monthBeginDay, DateProperty.DAY );
@@ -98 +98 @@
                 numberOfWeeks = Math.ceil((7 - ((monthBeginDay.getProperty(DateProperty.DAY)+7)%7) + numberOfDays) / 7.0 );
             }
-
-
-//            toolTip = "currentDay: "+currentDay_+"; numberOfDays:"+numberOfDays+"; numberOfWeeks:"+numberOfWeeks+"; " +
-//                      "monthBeginDay:"+(monthBeginDay.toString())+"; monthEndDay:"+(monthEndDay.toString());
         }
         public function get currentDay():Date{
@@ -144 +140 @@
 
                         // splitted over more than one days, so add it to all corresponding dataProviders
-                        for (i = startDay.getDate(); i <= endDay.getDate(); i++) {
-                            dataProviders[ i ].put(timeFrame.UUID, timeFrame);
+                        var innerTimeFrame:TimeFrameEntity, iter:DateUtil = (new DateUtil( startDay )).dayBegin();
+                        for (i = startDay.getDate(); i <= endDay.getDate(); i++, iter.add( DateProperty.DATE, 1 )) {
+                            innerTimeFrame = timeFrame.clone();
+                            if(i>startDay.getDate())  innerTimeFrame.from = iter.dayBegin().date;                            
+                            if(i<endDay.getDate())  innerTimeFrame.to = iter.dayEnd().date;
+                            dataProviders[ i ].put(innerTimeFrame.UUID, innerTimeFrame);
                         }                        
                     }
                 }
 
-                var ev:DayEventsField;                
-                //var i:int = 0, 
-//                        var timeBegin:int, timeEnd:int;
-//                var from:DateUtil, to:DateUtil, current:DateUtil = (new DateUtil(currentDay)).dayBegin();
+
                 // create DayEventsField instance for each day in month
+                var ev:DayEventsField;                 
                 var monthIter:DateUtil = monthBeginDay.clone();
                 var complement:int = ((monthBeginDay.getProperty(DateProperty.DAY)+6)%7);
                 for(i=1; i<=numberOfDays; i++, monthIter.add( DateProperty.DATE, 1 )) {
-
 
                     ev = new DayEventsField();