DataObjects/Core_curr_rate.php

[Pman.Core] / Pman.Gnumeric.js

diff --git a/Pman.Gnumeric.js b/Pman.Gnumeric.js
index f9e9338..5ebfd30 100644 (file)
--- a/Pman.Gnumeric.js
+++ b/Pman.Gnumeric.js
@@ -311,11 +311,11 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
 
         Roo.each(merge, function(c) {
             var rc = _t.rangeToRC(c.textContent);
-            Roo.log(JSON.stringify(rc));
+            //Roo.log(JSON.stringify(rc));
             if (typeof(_t.grid[rc[0].r][rc[0].c]) == 'undefined') {
-                Roo.log(["creating empty cell for  ",rc[0].r,  rc[0].c ]);
-                
-                _t.grid[rc[0].r][rc[0].c] =  _t.createCell(rc[0].r, c : rc[0].c ); //Roo.applyIf({ r : rc[0].r, c : rc[0].c }, _t.defaultCell);
+                //Roo.log(["creating empty cell for  ",rc[0].r,  rc[0].c ]);
+                 _t.createCell(rc[0].r,  rc[0].c );
+                //_t.grid[rc[0].r][rc[0].c] =  //Roo.applyIf({ r : rc[0].r, c : rc[0].c }, _t.defaultCell);
             }
                 
             _t.grid[rc[0].r][rc[0].c].colspan = (rc[1].c - rc[0].c) + 1;
@@ -382,7 +382,10 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
                 for (var c = s.c; c < s.c1;c++) {
                     if (c > _t.cmax) continue;
     
-                    if (typeof(_t.grid[r][c]) == 'undefined') _t.grid[r][c] = Roo.applyIf({ r: r , c : c }, _t.defaultCell);
+                    if (typeof(_t.grid[r][c]) == 'undefined') {
+                        _t.createCell(r,c);
+                        //_t.grid[r][c] = Roo.applyIf({ r: r , c : c }, _t.defaultCell);
+                    }
                     var g=_t.grid[r][c];
                     if (typeof(g.cls) =='undefined') {
                         g.cls = [];
@@ -1369,12 +1372,33 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
         for (var r = 0; r < this.rmax;r++) {
             out += '<tr style="height:'+this.rowInfo[r]+'px;">';
             for (var c = 0; c < this.cmax;c++) {
-                var g = (typeof(grid[r][c]) == 'undefined') ? this.defaultCell  : grid[r][c];
+                if (typeof(grid[r][c]) == 'undefined')  {
+                    this.createCell(r,c);
+                    
+                }
+                var g = grid[r][c];
                 
                 if (typeof(g.cls) =='undefined') g.cls = [];
                 var w= calcWidth(c,g.colspan);
+                
+                var value = g.value[0] == '=' ? 'CALCULATED' : g.value;
+                
+                try {
+                    if(
+                        g.styles[0].firstElementChild.getAttribute('Format') == "D\\-MMM\\-YYYY;@" &&
+                        g.value[0] != '=' &&
+                        !isNaN(value * 1) && 
+                        value != 0
+                    ){
+                        value = new Date(value * 24 * 60 * 60 * 1000 + new Date('1899-12-30').getTime()).format('d-M-Y');
+                    }
+                    
+                } catch(e) {
+                    
+                }
+                
                 out+=String.format('<td colspan="{0}" rowspan="{1}"  class="{4}"><div style="{3}">{2}</div></td>', 
-                    g.colspan, g.rowspan, g.value,
+                    g.colspan, g.rowspan, value,
                     'overflow:hidden;' + 
                     'width:'+w+'px;' +