Changeset 502

Timestamp:

08/24/08 02:05:36 (3 months ago)

Author:

padams

Message:

addng open flash cahrt wdget rework

Location:

trunk

Files:

• modules/base/dashboardTrendWidget.php (modified) (5 diffs)
• modules/base/metrics/dashCoreByDay.php (modified) (2 diffs)
• modules/base/metrics/dashCoreByMonth.php (modified) (2 diffs)
• modules/base/templates/generic_table.tpl (added)
• modules/base/templates/ofc.tpl (added)
• modules/base/templates/report_dashboard.tpl (modified) (2 diffs)
• modules/base/templates/widget.tpl (modified) (1 diff)
• modules/base/widget.php (modified) (2 diffs)
• owa_base.php (modified) (2 diffs)
• owa_coreAPI.php (modified) (2 diffs)
• owa_metric.php (modified) (3 diffs)
• owa_template.php (modified) (2 diffs)
• owa_view.php (modified) (5 diffs)
• public/js/jQuery.owa.js (added)

trunk/modules/base/dashboardTrendWidget.php

@@ -42 +42 @@
                 $m->setPeriod($this->params['period']);
                 $m->setOrder(OWA_SQL_ASCENDING); 
-                $results = $m->generate();
+                
                 
                 if (array_key_exists('format', $this->params)):
@@ -51 +51 @@
                         
                 $data['title'] = 'Dashboard Trend';
-                $data['view'] = 'base.widget';
-                $data['y']['label'] = 'Page Views';
-                $data['y2']['label'] = 'Visits';
-                $data['x']['label'] = 'Day';
+                $data['params'] = $this->params;
+                $data['widget'] = 'base.dashboardTrendWidget';
                 
                 switch ($format) {
@@ -60 +58 @@
                         case 'graph':
                                 
+                                $data['view'] = 'base.openFlashChart';
+                                $data['height'] = $this->params['height'];
+                                $data['width'] = $this->params['width'];
+                                break;
+                                
+                        case 'graph-data':
+                                $results = $m->generate();
                                 $series = owa_lib::deconstruct_assoc($results);
+                                $data['y']['label'] = 'Page Views';
+                                $data['y2']['label'] = 'Visits';
+                                $data['x']['label'] = 'Day';
                                 $data['y']['series'] = $series['page_views'];
                                 $data['y2']['series'] = $series['sessions'];
@@ -68 +76 @@
                                 
                         case 'table':
-                                $data['column_labels'] = array();
-                                $data['data'] = '';
+                                $m->setLimit(5);
+                                $results = $m->generate();
+                                $data['labels'] = $m->getLabels();
+                                $data['rows'] = $results;
                                 $data['view'] = 'base.genericTable';
                                 break;
@@ -75 +85 @@
                         
                 }
+                
+                if ($this->params['initial-view'] == true):
+                        $data['subview'] = $data['view'];
+                        $data['view'] = 'base.widget';
+                endif;
+                
                 
                 return $data;

trunk/modules/base/metrics/dashCoreByDay.php

@@ -33 +33 @@
         function owa_dashCoreByDay($params = null) {
                 
-                $this->params = $params;
+                return owa_dashCoreByDay::__construct($params);
+        
+        }
+        
+        function __construct($params = null) {
+        
+                parent::__construct($params);
                 
-                $this->owa_metric();
+                $this->setLabels(array('Month', 'Day', 'Year', 'Unique Visitors', 'Sessions', 'Page Views'));
                 
                 return;
@@ -62 +68 @@
                 $db->orderBy('day');
                 
+                if (array_key_exists('limit', $this->params)):
+                        $db->limit($this->params['limit']);
+                endif;
+                
                 $ret = $db->getAllRows();
                 
                 return $ret;
-                
-                
-/*
-                
-                $this->params['select'] = "session.month, 
-                        session.day, 
-                        session.year, 
-                        count(distinct session.visitor_id) as unique_visitors, 
-                        count(session.id) as sessions, 
-                        sum(session.num_pageviews) as page_views ";
-                
-                
-                $this->params['groupby'] = array('day', 'month');
-
-                $this->params['orderby'] = array('year', 'month', 'day');
-                
-                $this->setTimePeriod($this->params['period']);
-
-                $s = owa_coreAPI::entityFactory('base.session');
-                
-                return $s->query($this->params);
-
-*/              
+                                
         }
         

trunk/modules/base/metrics/dashCoreByMonth.php

@@ -33 +33 @@
         function owa_dashCoreByMonth($params = null) {
                 
-                $this->params = $params;
+                return owa_dashCoreByMonth::__construct($params);
                 
-                $this->owa_metric();
+        }
+        
+        function __construct($params = null) {
+        
+                parent::__construct($params);
                 
+                $this->setLabels(array('Month', 'Day', 'Year', 'Unique Visitors', 'Sessions', 'Page Views'));
+
                 return;
                 
@@ -61 +67 @@
                 return $db->getAllRows();
                 
-                /*
-                
-                $this->params['select'] = "session.month, 
-                        session.day, 
-                        session.year, 
-                        count(distinct session.visitor_id) as unique_visitors, 
-                        count(session.id) as sessions, 
-                        sum(session.num_pageviews) as page_views ";
-                
-                $this->params['use_summary'] = true;
-                
-                $this->params['groupby'] = array('month', 'year');
-
-                $this->params['orderby'] = array('year', 'month');
-                
-                $this->setTimePeriod($this->params['period']);
-
-                $s = owa_coreAPI::entityFactory('base.session');
-                
-                return $s->query($this->params);
-
-*/              
         }
         

trunk/modules/base/templates/report_dashboard.tpl

@@ -13 +13 @@
 </style>
 
+<script type="text/javascript" src="<?=$this->config['public_url'];?>js/includes/jquery/jquery.js"></script>
+
 <? include('report_header.tpl');?>
 
@@ -19 +21 @@
                 <TD valign="top" id="trend_graph">
                 
-                        <img src="<?=$this->graphLink(array('view' => 'base.graphDashboardTrend', 'period' => 'last_thirty_days', 'site_id' => $params['site_id'])); ?>">
+                        <!-- <img src="<?=$this->graphLink(array('view' => 'base.graphDashboardTrend', 'period' => 'last_thirty_days', 'site_id' => $params['site_id'])); ?>"> -->
                         
                         <?=$this->getWidget('base.dashboardTrendWidget', 'graph', array('height' => 300, 'width' => 900));?>
+                        <? //$this->getWidget('base.dashboardTrendWidget', 'table', array('height' => 300, 'width' => 900));?>
                 </TD>   
         </TR>

trunk/modules/base/templates/widget.tpl

@@ -1 @@
-<div style="border: 2px solid red;">
+<style>
 
-<div id="flash-graph" style="visiblity:;">
+.widget-container {border:1px solid #cccccc; width:100%;}
+.widget-header {color: white;background-color:orange; padding:10px;text-align:left; font-weight:bold; font-size:18px;}
+.widget-title {font-size:20px;text-align:right;}
+.widget-title a {color: white;}
+.widget-title-controls {font-size:14px;text-align:right;}
+.widget-controls {text-align:right;padding:10px}
+.widget-content {padding:10px;}
 
-<?=$this->ofc($params['width'], $params['height'], $this->makeAbsoluteLink(array('do' => $widget, 'period' => 'last_thirty_days', 'site_id' => $params['site_id'], 'format' => $format), false , $this->config['action_url'])); ?>
+</style>
 
-</div>
-
-<div id="data-table"></div>
-<div id="data-export"></div>
-
-</div>
 
 <script>
+var state = new Object;
+state['<?=$widget;?>'] = new Object;
+state['<?=$widget;?>'].url = "http://wp25-php5-test.openwebanalytics.com/index.php?owa_specialAction&owa_do=base.dashboardTrendWidget&owa_period=last_thirty_days&owa_format=";
 
 </script>
+
+<script> 
+        //var widgeturl = "http://wp25-php5-test.openwebanalytics.com/index.php?owa_specialAction&owa_do=base.dashboardTrendWidget&owa_period=last_thirty_days&owa_format=";
+        var widgeturl = state['<?=$widget;?>'].url;
+        
+  // When the document loads do everything inside here ... 
+     jQuery(document).ready(function(){ 
+     //$('#content').load('boo.php'); //by default initally load text from boo.php 
+                jQuery('.widget-control').click(function() { //start function when any link is clicked
+                        var parentname = jQuery("div").parent(".widget-container").attr("id");
+                        var widgetname2 = parentname.split("_");
+                        var widgetname = widgetname2[0];
+                        var widgetcontentid = "#"+widgetname+"_widget-content";
+                        var format = jQuery(this).attr("name");
+                        //alert(widgetcontentid);
+                        jQuery(widgetcontentid).slideUp("slow"); 
+                         //var content_show = $(this).attr("title"); //retrieve title of link so we can compare with php file 
+                        jQuery.ajax({ 
+                                method: "get",url: widgeturl+format, 
+                                beforeSend: function(){ jQuery(".widget-status").show("fast");}, //show loading just when link is clicked 
+                                complete: function(){ jQuery(".widget-status").hide("fast");}, //stop showing loading when the process is complete 
+                                success: function(html){ //so, if data is retrieved, store it in html 
+                                        jQuery(widgetcontentid).show("slow"); //animation 
+                                        jQuery(widgetcontentid).html(html); //show the html inside .content div 
+                                } 
+                        }); //close $.ajax( 
+         }); //close click( 
+     }); //close $( 
+</script> 
+
+
+<div id="<?=$widget;?>_widget-container" class="widget-container">
+
+        <div id="<?=$widget;?>_widget-header"class="widget-header">
+                <span class="widget-title"><?=$title;?></span>
+
+                <div id="<?=$widget;?>_widget-title-controls" style="float:right;">
+                        <span class="widget-title-controls"><a href="">Close</a></span>
+                </div>
+                
+        </div>
+
+        <div id="<?=$widget;?>_widget-status" class="widget-status">LOADING</div> 
+
+        <div id="<?=$widget;?>_widget-content" class="widget-content"><?=$subview;?></div>
+        
+        <div id="<?=$widget;?>_widget-controls" class="widget-controls">
+                <a class="widget-control" href="#base-dashboardTrendWidget_widget-header" name="graph">Graph</a> | 
+                <a class="widget-control" href="#base-dashboardTrendWidget_widget-header" name="table">Table</a> | 
+                <a class="widget-control" href="#base-dashboardTrendWidget_widget-header" name="sparkline">Sparkline</a>
+        </div>
+
+        
+</div>

trunk/modules/base/widget.php

@@ -83 +83 @@
                 // load template
                 
-                if ($data['is_external'] == true):
+                if ($data['params']['is_external'] == true):
                         $this->t->set_template('wrapper_widget.tpl');
                 else:
@@ -90 +90 @@
                 
                 if (!array_key_exists('width', $data)):
-                        $data['width'] = 300;
+                        $data['params']['width'] = 300;
                 endif;
                 
                 if (!array_key_exists('width', $data)):
-                        $data['height'] = 250;
+                        $data['params']['height'] = 250;
                 endif;
                 
                 $this->body->set_template('widget.tpl');
-                $this->body->set('format', $data['format']);
-                $this->body->set('widget', $data['widget']);                    
-                $this->body->set('params', $data['params']);    
+                $this->body->set('format', $data['params']['format']);
+                $this->body->set('widget', str_replace('.', '-', $data['widget']));                     
+                $this->body->set('params', $data['params']['params']);  
+                $this->body->set('title', $data['title']);      
                 return;
         }

trunk/owa_base.php

@@ -75 +75 @@
         function owa_base() {
                 
+                return owa_base::__construct();
+
+        }
+        
+        function __construct() {
+        
                 $this->e = &owa_coreAPI::errorSingleton();
                 $this->c = &owa_coreAPI::configSingleton();
@@ -80 +86 @@
                 
                 return;
-
+        
         }
         

trunk/owa_coreAPI.php

@@ -300 +300 @@
                 list($module, $file) = split("\.", $modulefile);
                 $class = $class_ns.$file.$class_suffix;
-        
+                //print $class;
                 // Require class file if class does not already exist
                 if(!class_exists($class)):      
@@ -369 +369 @@
                 list($module, $class) = split("\.", $subview);
                 
-                owa_lib::moduleRequireOnce($module, $class);
+                //owa_lib::moduleRequireOnce($module, $class);
         
                 $subview =  owa_lib::moduleFactory($module, $class.'View', $params);

trunk/owa_metric.php

@@ -52 +52 @@
          */
         var $params = array();
-        
-        var $db;
+                
+        /**
+         * The lables for calculated measures
+         *
+         * @var array
+         */
+        var $labels = array();
 
         /**
@@ -63 +68 @@
         function owa_metric($params = '') {
 
-                return $this->__construct($params);
+                return owa_metric::__construct($params);
         }
         
@@ -412 +417 @@
         
         }
+        
+        
+        /**
+         * Set the labels of the measures
+         *
+         */
+        function setLabels($array) {
+        
+                $this->labels = $array;
+                return;
+        }
+        
+        /**
+         * Retrieve the labels of the measures
+         *
+         */
+        function getLabels() {
+        
+                return $this->labels;
+        
+        }
+        
+        
 }
 

trunk/owa_template.php

@@ -579 +579 @@
         }
         
-        function getWidget($widget, $format, $params = '') {
+        function getWidget($widget, $format, $params = array()) {
                 
                 if (empty($params)):
@@ -587 +587 @@
                 $params['widget'] = $widget;
                 $params['format'] = $format;
-                
-                $api = owa_coreAPI::singleton();
-                
-                return $api->performAction('base.widget', $params);
+                $params['initial-view'] = true;
+                
+                return owa_coreAPI::performAction($widget, $params);
         }
         

trunk/owa_view.php

@@ -17 +17 @@
 //
 
-require_once('owa_template.php');
-require_once('owa_base.php');
-require_once('owa_requestContainer.php');
-require_once(OWA_BASE_CLASSES_DIR.'owa_coreAPI.php');
+require_once(OWA_BASE_CLASSES_DIR.'owa_template.php');
+//require_once(OWA_BASE_CLASSES_DIR.'owa_base.php');
+require_once(OWA_BASE_CLASSES_DIR.'owa_requestContainer.php'); // ??
+//require_once(OWA_BASE_CLASSES_DIR.'owa_coreAPI.php');
 
 /**
@@ -301 +301 @@
                 else: 
                         //$this->e->debug('RenderView: '.print_r($data, true));
-                        $api = &owa_coreAPI::singleton();
-                        
-                        $subview = $api->displaySubView($auth_data);
+                        //$api = &owa_coreAPI::singleton();
+                        
+                        $subview = owa_coreAPI::displaySubView($auth_data);
                         
                         return $subview;
@@ -412 +412 @@
 }
 
-class owa_pieFlashChartView extends owa_base {
+class owa_pieFlashChartView extends owa_view {
 
         function owa_pieFlashChartView() {
@@ -421 +421 @@
         function __construct() {
                 
-                return $this->owa_base();
+                return parent::__construct();
                 
         }
@@ -458 +458 @@
 }
 
-
-
-
+class owa_genericTableView extends owa_view {
+
+        function __construct() {
+                
+                return parent::__construct();
+                
+        }
+        
+        function owa_genericTableView() {
+        
+                return owa_genericTableView::__construct(); 
+        }
+        
+        function construct($data) {
+        
+                $this->t->set_template('wrapper_blank.tpl');            
+                $this->body->set_template('generic_table.tpl');
+                
+                if (!empty($data['labels'])):
+                        $this->body->set('labels', $data['labels']);
+                else:
+                        $this->body->set('labels', '');
+                endif;
+                        
+                if (!empty($data['rows'])):
+                        $this->body->set('rows', $data['rows']);
+                        $this->body->set('row_count', count($data['rows']));
+                else:
+                        $this->body->set('rows', '');
+                        $this->body->set('row_count', 0);
+                endif;
+                
+        }
+
+}
+
+class owa_openFlashChartView extends owa_view {
+
+        function owa_openFlashChartView() {
+                
+                owa_openFlashChartView::__construct();
+                
+                return;
+        }
+        
+        function __construct() {
+                
+                return parent::__construct();
+                
+        }
+        
+        function construct($data) {
+                
+                // load template
+                $this->t->set_template('wrapper_blank.tpl');
+                $this->body->set_template('ofc.tpl');
+                // set
+                $this->body->set('widget', $data['widget']);
+                $this->body->set('height', $data['height']);
+                $this->body->set('width', $data['width']);
+                
+                return;
+        
+        }
+
+}
 
 ?>