Fix #7123 - getting abra ready to test

[Pman.Xtuple] / Pman.Tab.XtupleDashboard.js

diff --git a/Pman.Tab.XtupleDashboard.js b/Pman.Tab.XtupleDashboard.js
index 28a9893..963d592 100644 (file)
--- a/Pman.Tab.XtupleDashboard.js
+++ b/Pman.Tab.XtupleDashboard.js
@@ -192,14 +192,7 @@ Pman.Tab.XtupleDashboard = new Roo.XComponent({
                                                                _this.mto.hide(); 
                                                                _this.daypick.hide();
                                                                
-                                                               _this.dateRange = function() {
-                                                                    return {
-                                                                       date_from : _this.mfrom.getValue(),
-                                                                        date_to :Date.parseDate(_this.mfrom.getValue(), 'Y-n-d').add(Date.YEAR, 1).format('Y-m-d')
-                                                             
-                                                                    };
-                                                               
-                                                               };
+                                                          
                                                                
                                                                
                                                                 break;
@@ -212,12 +205,7 @@ Pman.Tab.XtupleDashboard = new Roo.XComponent({
                                                                _this.mfrom.show();
                                                                _this.mto.hide(); 
                                                                _this.daypick.hide();
-                                                               _this.dateRange = function() {
-                                                                    return {
-                                                                        date_from : _this.mfrom.getValue(),
-                                                                        date_to :Date.parseDate(_this.mfrom.getValue(), 'Y-n-d').add(Date.MONTH, 6).format('Y-m-d')
-                                                                    };
-                                                               };
+                                                             
                                                               break;
                                                             case 'Q':                
                                                             
@@ -227,12 +215,7 @@ Pman.Tab.XtupleDashboard = new Roo.XComponent({
                                                                _this.mfrom.show();
                                                                _this.mto.hide(); 
                                                                _this.daypick.hide();
-                                                               _this.dateRange = function() {
-                                                                    return {
-                                                                        date_from : _this.mfrom.getValue(),
-                                                                        date_to :Date.parseDate(_this.mfrom.getValue(), 'Y-n-d').add(Date.MONTH, 3).format('Y-m-d')
-                                                                    };
-                                                                };   
+                                                                  
                                                                 break;
                                                     
                                                             case 'M':        
@@ -241,12 +224,7 @@ Pman.Tab.XtupleDashboard = new Roo.XComponent({
                                                                _this.mfrom.show();
                                                                _this.mto.hide(); 
                                                                _this.daypick.hide();
-                                                                _this.dateRange = function() {
-                                                                    return {
-                                                                        date_from : _this.mfrom.getValue(),
-                                                                        date_to :Date.parseDate(_this.mfrom.getValue(), 'Y-n-d').add(Date.MONTH, 1).format('Y-m-d')
-                                                                    };
-                                                                };   
+                                                                 
                                                                 break;        
                                                             
                                                     
@@ -262,12 +240,7 @@ Pman.Tab.XtupleDashboard = new Roo.XComponent({
                                                                  _this.mfrom.show();
                                                                 _this.mto.show(); 
                                                                 _this.daypick.hide();
-                                                                 _this.dateRange = function() {
-                                                                    return {
-                                                                        date_from : _this.mfrom.getValue(),
-                                                                        date_to : _this.mto.getValue()
-                                                                    };
-                                                                };   
+                                                                 
                                                                 
                                                                 
                                                                 break;
@@ -337,83 +310,41 @@ Pman.Tab.XtupleDashboard = new Roo.XComponent({
                                                           break;
                                                         case 'Q':                
                                                         
-                                                            var m = Math.floor(((new Date()).format('n') *1 -1) / 4) * 4;
-                                                
-                                                           _this.mfrom.setValue(n.add(Date.MONTH, m));           
-                                                           _this.mfrom.show();
-                                                           _this.mto.hide(); 
-                                                           _this.daypick.hide();
-                                                           _this.dateRange = function() {
+                                                            
+                                                 
                                                                 return {
                                                                     date_from : _this.mfrom.getValue(),
                                                                     date_to :Date.parseDate(_this.mfrom.getValue(), 'Y-n-d').add(Date.MONTH, 3).format('Y-m-d')
                                                                 };
-                                                            };   
+                                                           
                                                             break;
                                                 
                                                         case 'M':        
-                                                            var m = (new Date()).format('n') *1  - 1 ;
-                                                           _this.mfrom.setValue(n.add(Date.MONTH, m ));
-                                                           _this.mfrom.show();
-                                                           _this.mto.hide(); 
-                                                           _this.daypick.hide();
-                                                            _this.dateRange = function() {
+                                                           
                                                                 return {
                                                                     date_from : _this.mfrom.getValue(),
                                                                     date_to :Date.parseDate(_this.mfrom.getValue(), 'Y-n-d').add(Date.MONTH, 1).format('Y-m-d')
                                                                 };
-                                                            };   
-                                                            break;        
+                                                              
+                                                               
                                                         
                                                 
                                                         
                                                         case 'R':
-                                                            // this month..
-                                                            var m = (new Date()).format('n') * 1;            
-                                                           _this.mfrom.setValue(n.add(Date.MONTH, m-1 )); 
-                                                           _this.mto.setValue(n.add(Date.MONTH,m )); 
-                                                        
-                                                        
-                                                        
-                                                             _this.mfrom.show();
-                                                            _this.mto.show(); 
-                                                            _this.daypick.hide();
-                                                             _this.dateRange = function() {
+                                                           
                                                                 return {
                                                                     date_from : _this.mfrom.getValue(),
                                                                     date_to : _this.mto.getValue()
                                                                 };
-                                                            };   
-                                                            
+                                                           
                                                             
                                                             break;
-                                                        /*
-                                                         case 'W': // today
-                                                            var d = (new Date()).format('w') * -1;
-                                                            _this.daypick.setValue( (new Date()).add(Date.DAY, d )); 
-                                                             _this.mfrom.hide();
-                                                            _this.mto.hide(); 
-                                                            _this.daypick.show();
-                                                            break;
-                                                        
-                                                        
-                                                        case 'D': // today
-                                                            _this.daypick.setValue(new Date()); 
-                                                             _this.mfrom.hide();
-                                                            _this.mto.hide(); 
-                                                            _this.daypick.show();
-                                                            break;
-                                                            */
+                                                       
                                                         default:
-                                                            alerT("oops invalid ftype?");
+                                                            Roo.MessageBox.alert("select range");
                                                             return;
                                                     }
-                                                
-                                                    return {
-                                                                   date_from : _this.mfrom.getValue(),
-                                                                    date_to :Date.parseDate(_this.mfrom.getValue(), 'Y-n-d').add(Date.YEAR, 1).format('Y-m-d')
-                                                         
-                                                                };
+                                                 
                                                 },
                                                 store : {
                                                     xtype: 'SimpleStore',