Changeset 4046

Timestamp:

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

Author:

mszopinski

Message:

calendar, month display

Location:

ssme/trunk

Files:

• flex/Calendar/src/com/kh/ssme/components/DayEventsField.as (modified) (8 diffs)
• flex/Calendar/src/com/kh/ssme/components/EventBox.mxml (added)
• flex/Calendar/src/com/kh/ssme/components/EventField.as (modified) (3 diffs)
• flex/Calendar/src/com/kh/ssme/components/EventTooltip.mxml (added)
• flex/Calendar/src/com/kh/ssme/components/MonthCanvas.as (modified) (3 diffs)
• flex/Common/src/com/kh/ssme/entity/TimeFrameEntity.as (modified) (1 diff)
• web/flex/Calendar.swf (modified) (previous)

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

@@ -23 +23 @@
 package com.kh.ssme.components {
 
-    import com.kh.ssme.entity.TimeFrameEntity;
+import com.kh.ssme.components.EventTooltip;
+import com.kh.ssme.entity.TimeFrameEntity;
     import com.kh.ssme.util.DayEventsFieldTypeEnum;
     import com.kh.ssme.util.HashArray;
@@ -32 +33 @@
 import mx.controls.Button;
 import mx.controls.Label;
+import mx.events.ToolTipEvent;
 import mx.formatters.DateFormatter;
 
@@ -48 +50 @@
             this.visible = this.includeInLayout = true;
             setStyle("borderThickness", 2);
-            setStyle("borderColor", 0xBBBBFF);            
+            setStyle("borderColor", 0xBBBBFF);
+            this.verticalScrollPolicy = "off";
+            this.horizontalScrollPolicy = "off";
 
             container_ = new VBox();
             container_.percentWidth = 100;
             container_.percentHeight = 100;
+            container_.setStyle("verticalGap",0);
+            container_.setStyle("textAlign","center");               
+            container_.verticalScrollPolicy = "off";
+            container_.horizontalScrollPolicy = "off";            
             this.addChild( container_ );
 
@@ -64 +72 @@
             innerContainer_.percentWidth = 100;
             innerContainer_.percentHeight = 100;
-            innerContainer_.setStyle( "backgroundColor", 0x880000 );
+            innerContainer_.setStyle("verticalGap",1);
+            innerContainer_.setStyle("paddingLeft",2);
+            innerContainer_.setStyle("paddingRight",2);
+            innerContainer_.setStyle("textAlign","center");            
+            innerContainer_.verticalScrollPolicy = "off";
+            innerContainer_.horizontalScrollPolicy = "off";            
             container_.addChild( innerContainer_ );
 
@@ -76 +89 @@
             timeFormatter.formatString = "JJ:NN";
 
-            this.toolTip = "";               
         }
 
@@ -106 +118 @@
             var timeframe:TimeFrameEntity, o:Object, tempButton:Button;
             for each(o in dataProviderArray_){
-                timeframe = (o.valueOf as TimeFrameEntity);
+                timeframe = (o.value as TimeFrameEntity);
                 if(timeframe){
-                    tempButton = new Button();
-                    tempButton.height = 20;
-                    tempButton.setStyle( "highlightAlphas",  [0, 0]);
-                    tempButton.setStyle( "fillAlphas",  [0.6, 0.4, 0.6, 0.4]);
-                    tempButton.setStyle( "fillColors",  [0xffffff, 0x999999, 0xffffff, 0x999999]);
-                    tempButton.setStyle( "themeColor",  0x0000cc );
-                    tempButton.label = timeFormatter.format( timeframe.from )+" - "+timeFormatter.format( timeframe.to );
+                    tempButton = new EventBox();
+                    tempButton.height = 15;
+                    tempButton.width = 120;
+                    tempButton.label = timeFormatter.format( timeframe.from )+" - "+timeFormatter.format( timeframe.to )+" "+timeframe.description;
+                    tempButton.data = timeframe;
                     innerContainer_.addChild( tempButton );
                 }
@@ -126 +136 @@
         }
         private function sortTimeFrames(a:Object, b:Object):int {
+            var result:Number = 0;
             if(a && b && a.value && b.value && a.value is TimeFrameEntity && b.value is TimeFrameEntity){
-                return (a.value as TimeFrameEntity).from.time - (b.value as TimeFrameEntity).from.time;
+                result = (a.value as TimeFrameEntity).from.time - (b.value as TimeFrameEntity).from.time;
             }
-            return 0;
+            if(result == 0){
+                return (a.value as TimeFrameEntity).to.time - (b.value as TimeFrameEntity).to.time;
+            }
+            return result;
+        }
+        private function createEventTooltip(event:ToolTipEvent, timeframe:TimeFrameEntity):void {
+            event.toolTip = new EventTooltip();
+            (event.toolTip as EventTooltip).data = timeframe;
         }
 
+    
         protected override function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void{
             super.updateDisplayList( unscaledWidth, unscaledHeight );
@@ -145 +164 @@
                 sumHeight += button.height;
                 button.visible = button.includeInLayout = sumHeight < unscaledHeight;
+                button.width = unscaledWidth - 8;//Math.max( 0, unscaledWidth-button.width/2 );
                 if(sumHeight < unscaledHeight)  displayed++;
             }
-
-            bottomTitle_.text = "+"+(dataProvider_.size - displayed);              
+            bottomTitle_.text = (dataProvider_.size > displayed) ? "+"+(dataProvider_.size - displayed) : "";              
         }        
 

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

@@ -39 +39 @@
             this.addChild( container_ );
 
-            this.toolTip = "";            
+            this.toolTip = " ";
+            this.addEventListener(ToolTipEvent.TOOL_TIP_CREATE, createEventTooltip);
         }
 
@@ -93 +94 @@
         public var leftPosition:int;
 
+        
         protected override function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void{
             super.updateDisplayList( unscaledWidth, unscaledHeight );
@@ -107 +109 @@
         }
 
+        private function createEventTooltip(event:ToolTipEvent):void {
+            event.toolTip = new EventTooltip();
+            (event.toolTip as EventTooltip).data = (data) ? data : null;
+        }
+
     }
 

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();

ssme/trunk/flex/Common/src/com/kh/ssme/entity/TimeFrameEntity.as

@@ -84 +84 @@
         protected static const meetingRequests_field:String = 'meetingRequests';
         protected static const priority_field:String = 'priority';
+
+        public function clone():TimeFrameEntity{
+            var newTF:TimeFrameEntity = new TimeFrameEntity();
+
+            // plain
+            newTF.from = new Date(from.time);
+            newTF.to = new Date(to.time);
+            newTF.repeatTypeUUID = new String( repeatTypeUUID );
+            newTF.repeatTypeName = new String( repeatTypeName );
+            newTF.repeatTypeEntity = new String( repeatTypeEntity );
+            newTF.title = new String( title );
+            newTF.description = new String( description );
+
+            // enums
+            newTF.type = type;
+            newTF.priority = priority;
+
+            // entities
+            newTF.eventPlaceUUID = new String( eventPlaceUUID );
+            newTF.eventPlaceName = new String( eventPlaceName );
+            newTF.eventPlaceEntity = eventPlaceEntity; //  TODO:.clone();
+            newTF.travelFromUUID = new String( travelFromUUID );
+            newTF.travelFromName = new String( travelFromName );
+            newTF.travelFromEntity = travelFromEntity; //  TODO:.clone();
+            newTF.travelToUUID = new String( travelToUUID );
+            newTF.travelToName = new String( travelToName );
+            newTF.travelToEntity = travelToEntity; //  TODO:.clone();
+            newTF.stayPlaceUUID = new String( stayPlaceUUID );
+            newTF.stayPlaceName = new String( stayPlaceName );
+            newTF.stayPlaceEntity = stayPlaceEntity; //  TODO:.clone();
+            newTF.calendarUUID = new String( calendarUUID );
+            newTF.calendarName = new String( calendarName );
+            newTF.calendarEntity = calendarEntity; //  TODO:.clone();
+            newTF.suggestedTimeStateUUID = new String( suggestedTimeStateUUID );
+            newTF.suggestedTimeStateName = new String( suggestedTimeStateName );
+            newTF.suggestedTimeStateEntity = suggestedTimeStateEntity; //  TODO:.clone();
+
+            // arrays
+            newTF.meetingRequestsEntites = (meetingRequestsEntites) ? meetingRequestsEntites.clone() : null;
+            newTF.meetingRequestsNames = (meetingRequestsNames) ? meetingRequestsNames.clone() : null;
+            
+            return newTF;
+        }
 
         public override function parseJSONObject(json:Object, recursive:int = 0):* {