Changeset 4040

Timestamp:

08/11/10 12:55:02 (18 months ago)

Author:

mszopinski

Message:

calendar, one-day display

Location:

ssme/trunk/flex

Files:

• Calendar/src/Calendar.mxml (modified) (9 diffs)
• Calendar/src/com/kh/ssme/components/DayCanvas.as (modified) (5 diffs)
• Calendar/src/com/kh/ssme/components/EventField.as (modified) (3 diffs)
• Calendar/src/com/kh/ssme/components/SimpleEventDisplay.as (modified) (1 diff)
• Common/src/com/kh/ssme/components/GridCanvas.as (modified) (5 diffs)
• Common/src/com/kh/ssme/IconSet.as (added)
• Common/src/com/kh/ssme/util/DateUtil.as (modified) (1 diff)

ssme/trunk/flex/Calendar/src/Calendar.mxml

@@ -155 +155 @@
                         width="100%" height="100%" minHeight="400"
                         outerBorderColor="0x000000" outerBorderAlpha="1.0" outerBorderThickness="1"
-                        innerBorderColors="[ 0x000000, 0x444444, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3, 0.3 ]" innerBorderThicknesses="[ 2, 1, 1 ]"
-                        backgroundColor="0xffffff" backgroundAlpha="0"
-                        rows="[ 24, 48, 96 ]" columns="[ 1 ]"
+                        innerBorderColors="[ 0x000000, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3 ]" innerBorderThicknesses="[ 2, 1 ]"
+                        backgroundColor="0xffffff" backgroundAlpha="0"
+                        rows="[ 24, 96 ]" columns="[ 1 ]"
                         visible="true" includeInLayout="true"
                         cornerRadius="0">
@@ -166 +166 @@
                         width="100%" height="100%" minHeight="400"
                         outerBorderColor="0x000000" outerBorderAlpha="1.0" outerBorderThickness="1"
-                        innerBorderColors="[ 0x000000, 0x444444, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3, 0.3 ]" innerBorderThicknesses="[ 2, 1, 1 ]"
-                        backgroundColor="0xffffff" backgroundAlpha="0"
-                        rows="[ 24, 48, 96 ]" columns="[ 1 ]"
+                        innerBorderColors="[ 0x000000, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3 ]" innerBorderThicknesses="[ 2, 1 ]"
+                        backgroundColor="0xffffff" backgroundAlpha="0"
+                        rows="[ 24, 96 ]" columns="[ 1 ]"
                         showEffect="{ fadeIn }" hideEffect="{ fadeOut }"
                         cornerRadius="0">
@@ -177 +177 @@
                         width="100%" height="100%" minHeight="400"
                         outerBorderColor="0x000000" outerBorderAlpha="1.0" outerBorderThickness="1"
-                        innerBorderColors="[ 0x000000, 0x444444, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3, 0.3 ]" innerBorderThicknesses="[ 2, 1, 1 ]"
-                        backgroundColor="0xffffff" backgroundAlpha="0"
-                        rows="[ 24, 48, 96 ]" columns="[ 1 ]"
+                        innerBorderColors="[ 0x000000, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3 ]" innerBorderThicknesses="[ 2, 1 ]"
+                        backgroundColor="0xffffff" backgroundAlpha="0"
+                        rows="[ 24, 96 ]" columns="[ 1 ]"
                         showEffect="{ fadeIn }" hideEffect="{ fadeOut }"
                         cornerRadius="0">
@@ -188 +188 @@
                         width="100%" height="100%" minHeight="400"
                         outerBorderColor="0x000000" outerBorderAlpha="1.0" outerBorderThickness="1"
-                        innerBorderColors="[ 0x000000, 0x444444, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3, 0.3 ]" innerBorderThicknesses="[ 2, 1, 1 ]"
-                        backgroundColor="0xffffff" backgroundAlpha="0"
-                        rows="[ 24, 48, 96 ]" columns="[ 1 ]"
+                        innerBorderColors="[ 0x000000, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3 ]" innerBorderThicknesses="[ 2, 1 ]"
+                        backgroundColor="0xffffff" backgroundAlpha="0"
+                        rows="[ 24, 96 ]" columns="[ 1 ]"
                         showEffect="{ fadeIn }" hideEffect="{ fadeOut }"
                         cornerRadius="0">
@@ -199 +199 @@
                         width="100%" height="100%" minHeight="400"
                         outerBorderColor="0x000000" outerBorderAlpha="1.0" outerBorderThickness="1"
-                        innerBorderColors="[ 0x000000, 0x444444, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3, 0.3 ]" innerBorderThicknesses="[ 2, 1, 1 ]"
-                        backgroundColor="0xffffff" backgroundAlpha="0"
-                        rows="[ 24, 48, 96 ]" columns="[ 1 ]"
+                        innerBorderColors="[ 0x000000, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3 ]" innerBorderThicknesses="[ 2, 1 ]"
+                        backgroundColor="0xffffff" backgroundAlpha="0"
+                        rows="[ 24, 96 ]" columns="[ 1 ]"
                         showEffect="{ fadeIn }" hideEffect="{ fadeOut }"
                         cornerRadius="0">
@@ -210 +210 @@
                         width="100%" height="100%" minHeight="400"
                         outerBorderColor="0x000000" outerBorderAlpha="1.0" outerBorderThickness="1"
-                        innerBorderColors="[ 0x000000, 0x444444, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3, 0.3 ]" innerBorderThicknesses="[ 2, 1, 1 ]"
-                        backgroundColor="0xffffff" backgroundAlpha="0"
-                        rows="[ 24, 48, 96 ]" columns="[ 1 ]"
+                        innerBorderColors="[ 0x000000, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3 ]" innerBorderThicknesses="[ 2, 1 ]"
+                        backgroundColor="0xffffff" backgroundAlpha="0"
+                        rows="[ 24, 96 ]" columns="[ 1 ]"
                         showEffect="{ fadeIn }" hideEffect="{ fadeOut }"
                         cornerRadius="0">
@@ -221 +221 @@
                         width="100%" height="100%" minHeight="400"
                         outerBorderColor="0x000000" outerBorderAlpha="1.0" outerBorderThickness="1"
-                        innerBorderColors="[ 0x000000, 0x444444, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3, 0.3 ]" innerBorderThicknesses="[ 2, 1, 1 ]"
-                        backgroundColor="0xffffff" backgroundAlpha="0"
-                        rows="[ 24, 48, 96 ]" columns="[ 1 ]"
+                        innerBorderColors="[ 0x000000, 0x888888 ]" innerBorderAlphas="[ 0.5, 0.3 ]" innerBorderThicknesses="[ 2, 1 ]"
+                        backgroundColor="0xffffff" backgroundAlpha="0"
+                        rows="[ 24, 96 ]" columns="[ 1 ]"
                         showEffect="{ fadeIn }" hideEffect="{ fadeOut }"                        
                         cornerRadius="0">
@@ -301 +301 @@
                 calendarsList.push( { uuid:key, name:loggedUserEntity.calendarsNames[key] } );
             }
+            calendarsList.sort( sortCalendars );
             calendarsList.push( { uuid:null, name: "All" } );
-            calendarCombo.selectedIndex = -1;
+            calendarCombo.selectedIndex = -1;                   
+        }
+        private function sortCalendars(a:Object, b:Object):int {
+            return ( a.name < b.name ) ? -1 : (( a.name > b.name ) ? 1 : 0 );
         }
 
@@ -387 +391 @@
         private var dayCanvas:Array = [ canvas_1, canvas_2, canvas_3, canvas_4, canvas_5, canvas_6, canvas_7 ];
         private function showDayEvents():void {
+            canvas_1.currentDay = chosenDate.selectedDate; 
             canvas_1.dataProvider = calendarEntity.timeFramesEntitites;
         }

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

@@ -24 +24 @@
 
     import com.kh.ssme.entity.TimeFrameEntity;
+import com.kh.ssme.util.DateUtil;
 import com.kh.ssme.util.HashArray;
 
@@ -38 +39 @@
         }
 
-//        public var showHourLabels:Boolean = false;
-//
-//        private var hourLabels:HashArray = new HashArray();
-//
-//        override protected function createChildren():void{
-//            super.createChildren();
-//
-//            if(showHourLabels){
-//                var score:int;
-//                var el:Label;
-//                for(var i:int=0; i<=24; i++){
-//                    el = new Label();
-//                    el.id = el.text = ((i<10)?("0"+i):(i))+":00";
-//
-//                    if( !hourLabels.containsKey(el.id) ){
-//
-//                        this.addChild( el );
-//
-//                        el.setStyle("textAlign","right");
-//                        el.setStyle("color", 0x000000);
-//                        el.setStyle("fontSize", 11);
-//                        el.visible = el.includeInLayout = false;//((i%24) == 0);
-//                        score = 0x20;
-//                        if(i%24 == 0)    score |= 0x01;
-//                        if(i%12 == 0)    score |= 0x02;
-//                        if(i%6 == 0)     score |= 0x04;
-//                        if(i%3 == 0)     score |= 0x08;
-//                        if(i%2 == 0)     score |= 0x10;
-//
-//                        hourLabels.put( el.id, { score:score, element:el } );
-//
-//                    }
-//                }
-//            }
-//
-//        }
+        public var currentDay:Date;
 
         override protected function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void{
 
-            // call first in order to get grid drawn correctly
-            super.updateDisplayList(unscaledWidth, unscaledHeight);
-
-            // do not erase old drawings!
-            //graphics.clear();   
-            
-//            if(showHourLabels && hourLabels.size>0){ // added
-//
-//                var textHeight:int = (hourLabels.getValueAt(0).element as Label).textHeight;    // label text height
-//                var count:int = Math.floor( unscaledHeight / (textHeight*1.5) );    // determine number of labels
-//                var mark:int = 0x01;
-//                if(count <= 3)              mark = 0x02;
-//                else if (count <= 5)        mark = 0x04;
-//                else if (count <= 9)        mark = 0x08;
-//                else if (count <= 12)       mark = 0x10;
-//                else /*if (count <= 24)*/   mark = 0x20;
-//
-//                var item:Object;
-//                var inBorderThicknesses:Array = getStyle_("innerBorderThicknesses", [ 1 ]);
-//                var ystep:Number = (unscaledHeight - (2*outerBorderThickness_+2*verticalMargin_) - (23*inBorderThicknesses[0])) / 24;
-//                var y:Number = outerBorderThickness_+verticalMargin_;
-//                //graphics.lineStyle(1, 0x0000ff, 0.7, true);   // debug
-//                for (var row:int = 0; row <=24; row++ ){
-//                    //graphics.drawRoundRect(0, y - (textHeight*0.66), leftHorizontalMargin_, Math.min( Math.floor( ystep ), textHeight), 0, 0);// debug
-//
-//                    item = hourLabels.getValueAt(row);
-//                    item.element.visible = item.element.includeInLayout = true;//(item.score & mark) > 0;
-//                    item.element.x = 0;
-//                    item.element.y = Math.floor( y - (textHeight*0.66) );
-//                    item.element.width = leftHorizontalMargin_;
-//                    item.element.height = Math.min( Math.floor( ystep ), textHeight);
-//
-//                    y += (ystep + inBorderThicknesses[0]);
-//                }
-//
-//            }
-
+            if(visible){    // repaint only if visible
+                // call first in order to get grid drawn correctly
+                super.updateDisplayList(unscaledWidth, unscaledHeight);
+            }
         }
 
@@ -120 +53 @@
         public function set dataProvider(value:HashArray):void{
             dataProvider_ = value;
-
+            
             for(var i:int = 0; i<eventsMap.size; i++){
-                this.removeChild( eventsMap.getValueAt(i) );
+                if( eventsMap.getValueAt(i) ){
+                    this.removeChild( eventsMap.getValueAt(i) );                    
+                    trace( "REMOVE : "+eventsMap.getValueAt(i).data+" - ["+eventsMap.getValueAt(i).data.UUID+"] " );
+                }
             }
+            eventsMap.clear();
+            
             createEvents();
             validateNow();
@@ -143 +81 @@
                 ev = new EventField();
                 eventsMap.put(json.UUID, ev);
-                //ev.setStyle("backgroundColor", 0xffff00);
+                
+                ev.eventInfo = new SimpleEventDisplay();
+                ev.data = json;
+                ev.name = json.UUID;
                 ev.setStyle("borderThickness", 5);
                 ev.setStyle("cornerRadius", 20);
-                ev.name = json.UUID;
-
-                ev.eventInfo = new SimpleEventDisplay();
-                ev.eventInfo.eventData = json;                
+                trace( "ADD : "+ev.data+" - ["+ev.data.UUID+"] " );                     
 
                 addChild( ev );
                 sizeEvent( ev, i );
                 i += 100;
-
-//                var c:Canvas = new Canvas();
-//                c.width = 100;
-//                c.height = ev.height;
-//                c.x = 300;
-//                c.y = ev.y;
-//                c.setStyle("backgroundColor", 0xff0000);
-//                addChild( c );
 
             }
@@ -170 +100 @@
             var data:TimeFrameEntity = ev.eventInfo.eventData;
             if(data){
-                var stepY:Number = (this.height - 2*outerBorderThickness_);
-                stepY /= 96;    // (24hours * 4quarters)
+                var timeBegin:int = (data.from.getHours() * 4) + ((data.from.getMinutes() as int)/15);
+                var timeEnd:int = (data.to.getHours() * 4) + ((data.to.getMinutes() as int)/15);
 
-                var timeBegin:int = ((data.from.getMinutes() as int)/15);
-                var timeWidth:int = data.to.getHours() - data.from.getHours() + 1;
-                timeWidth *= 4;
-                timeWidth -= ( timeBegin + (4 -((data.to.getMinutes() as int)/15)) );
-
-                ev.height = stepY * timeWidth;
+                // if event exceed current day
+                var from:DateUtil = (new DateUtil(data.from)).dayBegin();
+                var current:DateUtil = (new DateUtil(currentDay)).dayBegin();
+                var to:DateUtil = (new DateUtil(data.to)).dayBegin();
+           
+                if( current.compare(from) > 0 ){
+                    timeBegin = 0;
+                }
+                if( current.compare(to) < 0 ){
+                    timeEnd = rowsPosition[1].length - 1;
+                }
+       
                 ev.width = 200;//XXX
+                ev.height = rowsPosition[1][timeEnd] - rowsPosition[1][timeBegin];                
                 ev.x = 50+i;//XXX
-                ev.y = (data.from.getHours()*4 + timeBegin)*stepY + outerBorderThickness_;
+                ev.y = rowsPosition[1][timeBegin];
                 ev.invalidateSize();
                 ev.invalidateDisplayList();

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

@@ -23 +23 @@
 package com.kh.ssme.components {
 
-    import flash.display.DisplayObject;
+import com.kh.ssme.entity.TimeFrameEntity;
+
+import flash.display.DisplayObject;
 
     import mx.binding.utils.BindingUtils;
@@ -51 +53 @@
                 ( eventInfo_ as UIComponent ).x = ( eventInfo_ as UIComponent ).y = 0;  
                 container_.addChild( eventInfo_ as UIComponent );
-//                var a:TextArea = new TextArea();
-//                a.text = "[TEST]";
-//                a.width = 100;
-//                a.height = 100;
-//                container_.addChild( a );
             }
         }
@@ -61 +58 @@
             return eventInfo_;
         }
+
+        public override function set data(value:Object):void{
+            if(eventInfo_){
+                eventInfo_.eventData = value as TimeFrameEntity;
+            }
+        }        
+        public override function get data():Object{
+            return (eventInfo_) ? eventInfo_.eventData : null;    
+        }
+
 
         protected override function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void{

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

@@ -49 +49 @@
                 this.text += eventData_.from+"-"+eventData_.to+"\n";
                 this.text += eventData_.description+"\n";
+
+                this.toolTip = this.text;
             }
         }

ssme/trunk/flex/Common/src/com/kh/ssme/components/GridCanvas.as

@@ -39 +39 @@
          * Number of columns
          */
-        private var columns_:Array;
+        private var columns_:Array;  
         public function get columns():Array{
             return columns_;
@@ -49 +49 @@
             }
         }
+        public var columnsPosition:Array;              
+
 
         /**
@@ -63 +65 @@
             }
         }
+        public var rowsPosition:Array;          
 
 
@@ -183 +186 @@
 
             // inner border
-            var inBorderThickness:int;
+            var inBorderThickness:int, xTempPos:int, yTempPos:int;
+            columnsPosition = [];
+            rowsPosition = [];
             for (var i:int = 0; i<inBorderThicknesses.length; i++){
-                if (inBorderThicknesses[i] > 0)
-                {
+                // for each border level
+                if (inBorderThicknesses[i] > 0){
                     inBorderThickness = inBorderThicknesses[i];
                     graphics.lineStyle(inBorderThickness,inBorderColors[i],inBorderAlphas[i],
@@ -193 +198 @@
                                        CapsStyle.NONE);
 
+                    var tempColumnsPos:Array = [], tempRowsPos:Array = [];                      
                     if(columns_.length>=i){
                         var xstep:Number = (unscaledWidth - (2*outBorderThickness+leftHorizontalMargin+rightHorizontalMargin)  - (columns_[i] - 1)*inBorderThickness) / columns_[i];
+                        // left border position
                         var x:Number = outBorderThickness+leftHorizontalMargin;
-                        for ( var col:int = 1; col < columns_[i]; col++ )
-                        {
+                        xTempPos = x - inBorderThickness*0.5;
+                        tempColumnsPos.push( xTempPos );
+                        // draw column lines
+                        for ( var col:int = 1; col < columns_[i]; col++ ){
                             x += (xstep + inBorderThickness);
-                            graphics.moveTo(x - inBorderThickness*0.5, outBorderThickness + verticalMargin);// + inBorderThickness*0.5);
-                            graphics.lineTo(x - inBorderThickness*0.5, unscaledHeight - outBorderThickness - verticalMargin);// - inBorderThickness*0.5);                          
+                            xTempPos = x - inBorderThickness*0.5;
+                            graphics.moveTo(xTempPos, outBorderThickness + verticalMargin);
+                            graphics.lineTo(xTempPos, unscaledHeight - outBorderThickness - verticalMargin);
+                            tempColumnsPos.push( xTempPos );
                         }
+                        // right border position
+                        x += (xstep + inBorderThickness);
+                        xTempPos = x - inBorderThickness*0.5;
+                        tempColumnsPos.push( xTempPos );
                     }
                     if(rows_.length>=i){
                         var ystep:Number = (unscaledHeight - (2*outBorderThickness+2*verticalMargin) - (rows_[i] - 1)*inBorderThickness) / rows_[i];
+                        // top border position                        
                         var y:Number = outBorderThickness+verticalMargin;
-                        for (var row:int = 1; row < rows_[i]; row++ )
-                        {
+                        yTempPos = y - inBorderThickness*0.5;
+                        tempRowsPos.push( yTempPos );
+                        // draw rows lines
+                        for (var row:int = 1; row < rows_[i]; row++ ){
                             y += (ystep + inBorderThickness);
-                            graphics.moveTo(outBorderThickness + leftHorizontalMargin,// + inBorderThickness*0.5,
-                                    y - inBorderThickness*0.5);
-                            graphics.lineTo(unscaledWidth - outBorderThickness - rightHorizontalMargin, // - inBorderThickness*0.5,
-                                    y - inBorderThickness*0.5);
+                            yTempPos = y - inBorderThickness*0.5;
+                            graphics.moveTo(outBorderThickness + leftHorizontalMargin, yTempPos);
+                            graphics.lineTo(unscaledWidth - outBorderThickness - rightHorizontalMargin, yTempPos);
+                            tempRowsPos.push( yTempPos );                            
                         }
+                        // bottom border position
+                        y += (ystep + inBorderThickness);
+                        yTempPos = y - inBorderThickness*0.5;
+                        tempRowsPos.push( yTempPos );
                     }
-
+                    columnsPosition.push( tempColumnsPos );
+                    rowsPosition.push( tempRowsPos );                    
                 }
             }
 
-
-
         }
 

ssme/trunk/flex/Common/src/com/kh/ssme/util/DateUtil.as

@@ -109 +109 @@
         }
 
+        /**
+         * Returns whether this DateUtil represents a time before the time represented by the specified date param
+         * @param date
+         * @return
+         */
+        public function before(date:Date):Boolean{
+            return date_.time < date.time;
+        }
+
+        /**
+         * Returns whether this DateUtil represents a time after the time represented by the specified date param
+         * @param date
+         * @return
+         */
+        public function after(date:Date):Boolean{
+            return date_.time < date.time;
+        }
+
+        /**
+         * Compares the time values (millisecond offsets from the Epoch) represented by this DateUtil and given Date.
+         * @param date
+         * @return the value 0 if the time represented by the argument is equal to the time represented by this DateUtil;
+         *      a value less than 0 if the time of this Calendar is before the time represented by the argument;
+         *      and a value greater than 0 if the time of this Calendar is after the time represented by the argument. 
+         */
+        public function compare(date:DateUtil):int{
+            return (date_.time - date.timestamp) as int;
+        }
+
+        /**
+         * String representation of this DateUtil 
+         * @return
+         */
+        public function toString():String{
+            return "[DateUtil: "+date_.toString()+"]";
+        }
 
         //----------------------------------------------