allow string based values for comboboxarray

[roojs1] / Roo / calendar / View.js

diff --git a/Roo/calendar/View.js b/Roo/calendar/View.js
index ef82ebc..67a62c8 100644 (file)
--- a/Roo/calendar/View.js
+++ b/Roo/calendar/View.js
@@ -658,8 +658,8 @@ Roo.extend(Roo.calendar.View, Roo.BoxComponent,  {
         // first make sure there is enough space..
         
         this.cells.each(function(c) {
-            c.select('.fc-day-content div',true).first().setHeight(20);
-//            c.select('.fc-day-content div',true).first().setHeight(Math.max(34, c.rows * 20));
+//            c.select('.fc-day-content div',true).first().setHeight(20);
+            c.select('.fc-day-content div',true).first().setHeight(Math.max(34, c.rows * 20));
         });
         
         for (var e = 0; e < this.calevents.length; e++) {
@@ -669,9 +669,8 @@ Roo.extend(Roo.calendar.View, Roo.BoxComponent,  {
             
             for(var i =0; i < rows.length; i++) {
                 
-                var startCell = Roo.select('.fc-cell-' + rows[i].start.dateValue + ' .fc-day-content', true).first();
-                Roo.log('startCell');
-                Roo.log(startCell);
+                var startCell = Roo.select('.fc-cell-' + rows[i].start.dateValue + ' .fc-day-content div', true).first();
+                
                 // how many rows should it span..
                 
                 var  cfg = {
@@ -707,6 +706,7 @@ Roo.extend(Roo.calendar.View, Roo.BoxComponent,  {
                 if (i == 0) {
                     cfg.cls += ' fc-event-start';
                 }
+                
                 if ((i+1) == rows.length) {
                     cfg.cls += ' fc-event-end';
                 }
@@ -714,19 +714,23 @@ Roo.extend(Roo.calendar.View, Roo.BoxComponent,  {
 //                var ctr = this.el.select('.fc-event-container',true).first();
                 var cg = startCell.createChild(cfg);
                 
-                cg.setStyle('margin-top', rows[i].start.row * 20);
-                
                 cg.on('mouseenter' ,this.onEventEnter, this, ev);
                 cg.on('mouseleave' ,this.onEventLeave, this, ev);
                 cg.on('click', this.onEventClick, this, ev);
                 
                 ev.els.push(cg);
 //                
-//                var sbox = rows[i].start.select('.fc-day-content',true).first().getBox();
-//                var ebox = rows[i].end.select('.fc-day-content',true).first().getBox();
+                var sbox = rows[i].start.select('.fc-day-content',true).first().getBox();
+                var ebox = rows[i].end.select('.fc-day-content',true).first().getBox();
 //                //Roo.log(cg);
-//                cg.setXY([sbox.x +2, sbox.y +(ev.row * 20)]);    
+                cg.setXY([sbox.x +2, sbox.y +(ev.row * 20)]);   
+//                Roo.log(rows[i]);
+                var boxes = Math.ceil((rows[i].end.dateValue - rows[i].start.dateValue) / 86400000) + 1;
 //                cg.setWidth(ebox.right - sbox.x -2);
+//                Roo.log(boxes);
+                cg.setWidth(134 * boxes);
+//                cg.setWidth(134);
+                
             }