+
-
-
-
+
-
+
+
+
diff --git a/modules/base/widget.php b/modules/base/widget.php
index e896b683d..d94a137c0 100644
--- a/modules/base/widget.php
+++ b/modules/base/widget.php
@@ -82,24 +82,25 @@ function construct($data) {
// load template
- if ($data['is_external'] == true):
+ if ($data['params']['is_external'] == true):
$this->t->set_template('wrapper_widget.tpl');
else:
$this->t->set_template('wrapper_blank.tpl');
endif;
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;
}
diff --git a/owa_base.php b/owa_base.php
index 3a7cbe655..5b0709472 100644
--- a/owa_base.php
+++ b/owa_base.php
@@ -74,12 +74,18 @@ class owa_base {
*/
function owa_base() {
+ return owa_base::__construct();
+
+ }
+
+ function __construct() {
+
$this->e = &owa_coreAPI::errorSingleton();
$this->c = &owa_coreAPI::configSingleton();
$this->config = &$this->c->fetch('base');
return;
-
+
}
/**
diff --git a/owa_coreAPI.php b/owa_coreAPI.php
index e61a6affa..efff61960 100644
--- a/owa_coreAPI.php
+++ b/owa_coreAPI.php
@@ -299,7 +299,7 @@ function moduleFactory($modulefile, $class_suffix = null, $params = '', $class_n
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)):
owa_coreAPI::moduleRequireOnce($module, '', $file);
@@ -368,7 +368,7 @@ function subViewFactory($subview, $params = array()) {
list($module, $class) = split("\.", $subview);
- owa_lib::moduleRequireOnce($module, $class);
+ //owa_lib::moduleRequireOnce($module, $class);
$subview = owa_lib::moduleFactory($module, $class.'View', $params);
$subview->is_subview = true;
diff --git a/owa_metric.php b/owa_metric.php
index 4c936b0c0..534539ab4 100644
--- a/owa_metric.php
+++ b/owa_metric.php
@@ -51,8 +51,13 @@ class owa_metric extends owa_base {
* @var array
*/
var $params = array();
-
- var $db;
+
+ /**
+ * The lables for calculated measures
+ *
+ * @var array
+ */
+ var $labels = array();
/**
* Constructor
@@ -62,7 +67,7 @@ class owa_metric extends owa_base {
*/
function owa_metric($params = '') {
- return $this->__construct($params);
+ return owa_metric::__construct($params);
}
function __construct($params = '') {
@@ -411,6 +416,29 @@ function generate() {
return $this->calculate();
}
+
+
+ /**
+ * Set the labels of the measures
+ *
+ */
+ function setLabels($array) {
+
+ $this->labels = $array;
+ return;
+ }
+
+ /**
+ * Retrieve the labels of the measures
+ *
+ */
+ function getLabels() {
+
+ return $this->labels;
+
+ }
+
+
}
?>
\ No newline at end of file
diff --git a/owa_template.php b/owa_template.php
index 078aed00f..ea7454ca3 100644
--- a/owa_template.php
+++ b/owa_template.php
@@ -578,7 +578,7 @@ function performAction($action, $params) {
}
- function getWidget($widget, $format, $params = '') {
+ function getWidget($widget, $format, $params = array()) {
if (empty($params)):
$params = array();
@@ -586,10 +586,9 @@ function getWidget($widget, $format, $params = '') {
$params['widget'] = $widget;
$params['format'] = $format;
+ $params['initial-view'] = true;
- $api = owa_coreAPI::singleton();
-
- return $api->performAction('base.widget', $params);
+ return owa_coreAPI::performAction($widget, $params);
}
}
diff --git a/owa_view.php b/owa_view.php
index 4dfee4309..96b75288b 100644
--- a/owa_view.php
+++ b/owa_view.php
@@ -16,10 +16,10 @@
// $Id$
//
-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');
/**
* Abstract View Class
@@ -300,9 +300,9 @@ function assembleSubView($data) {
else:
//$this->e->debug('RenderView: '.print_r($data, true));
- $api = &owa_coreAPI::singleton();
+ //$api = &owa_coreAPI::singleton();
- $subview = $api->displaySubView($auth_data);
+ $subview = owa_coreAPI::displaySubView($auth_data);
return $subview;
endif;
@@ -411,7 +411,7 @@ function assembleView($data) {
}
-class owa_pieFlashChartView extends owa_base {
+class owa_pieFlashChartView extends owa_view {
function owa_pieFlashChartView() {
@@ -420,7 +420,7 @@ function owa_pieFlashChartView() {
function __construct() {
- return $this->owa_base();
+ return parent::__construct();
}
@@ -457,8 +457,71 @@ function assembleView($data) {
}
+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;
+
+ }
+
+}
?>
\ No newline at end of file
diff --git a/public/js/jQuery.owa.js b/public/js/jQuery.owa.js
new file mode 100644
index 000000000..4082da556
--- /dev/null
+++ b/public/js/jQuery.owa.js
@@ -0,0 +1,6 @@
+// OWA JQuery plugin
+
+$.fn.owa = function() {
+
+
+};
\ No newline at end of file