From 24988bd00ca2fdefc70926a21a812c2099e29e12 Mon Sep 17 00:00:00 2001 From: rylon Date: Wed, 17 Jul 2013 22:11:47 +0200 Subject: [PATCH] danube errorlogging, example admin module, small fixes --- api.php | 1 + danube/page/PageApi.php | 4 +- .../default_introduction.php | 2 +- danube/sai/autoload.inc.php | 5 ++ danube/sai/register_modules.php | 2 + .../main.html | 35 +++++++++++++ .../qualitymanagement.js | 50 +++++++++++++++++++ .../saimod_dasense_quality_management.php | 12 +++++ index.php | 1 + 9 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 danube/sai/autoload.inc.php create mode 100644 danube/sai/register_modules.php create mode 100644 danube/sai/saimod_dasense_quality_management/main.html create mode 100644 danube/sai/saimod_dasense_quality_management/qualitymanagement.js create mode 100644 danube/sai/saimod_dasense_quality_management/saimod_dasense_quality_management.php diff --git a/api.php b/api.php index 1419d0f..db75e81 100644 --- a/api.php +++ b/api.php @@ -3,6 +3,7 @@ require_once '../system/autoload.inc.php'; //SYSTEM Classes require_once 'danube/autoload.inc.php'; //Project Classes require_once '../system/log/register_exception_shortcut.php'; //allow ERROR() instead of \SYSTEM\LOG\ERROR() +require_once '../system/log/register_errorhandler_dbwriter.php'; //write errors to db require_once '../system/log/register_errorhandler_jsonoutput.php'; //print errors as json to caller require_once 'config.php'; diff --git a/danube/page/PageApi.php b/danube/page/PageApi.php index d8b7c5d..04dce73 100644 --- a/danube/page/PageApi.php +++ b/danube/page/PageApi.php @@ -44,8 +44,8 @@ class PageApi extends \SYSTEM\PAGE\PageClass { public static function action_developer(){ require_once '../system/sai/autoload.inc.php'; - //require_once 'dasense/sai/autoload.inc.php'; - //require_once 'dasense/sai/register_modules.php'; + require_once 'danube/sai/autoload.inc.php'; + require_once 'danube/sai/register_modules.php'; return new \SYSTEM\SAI\saigui();} } \ No newline at end of file diff --git a/danube/page/default_introduction/default_introduction.php b/danube/page/default_introduction/default_introduction.php index 7a80af1..2861fb6 100644 --- a/danube/page/default_introduction/default_introduction.php +++ b/danube/page/default_introduction/default_introduction.php @@ -4,7 +4,7 @@ class default_introduction extends SYSTEM\PAGE\Page { public function html(){ $vars = array(); - $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE)); + $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE)); return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_introduction/introduction.tpl'), $vars); } diff --git a/danube/sai/autoload.inc.php b/danube/sai/autoload.inc.php new file mode 100644 index 0000000..a744e2f --- /dev/null +++ b/danube/sai/autoload.inc.php @@ -0,0 +1,5 @@ +registerFolder(dirname(__FILE__).'',''); +$autoload->registerFolder(dirname(__FILE__).'/saimod_dasense_quality_management',''); diff --git a/danube/sai/register_modules.php b/danube/sai/register_modules.php new file mode 100644 index 0000000..0580d0b --- /dev/null +++ b/danube/sai/register_modules.php @@ -0,0 +1,2 @@ +register('saimod_dasense_quality_management'); \ No newline at end of file diff --git a/danube/sai/saimod_dasense_quality_management/main.html b/danube/sai/saimod_dasense_quality_management/main.html new file mode 100644 index 0000000..9d2206a --- /dev/null +++ b/danube/sai/saimod_dasense_quality_management/main.html @@ -0,0 +1,35 @@ + + + + + da_sense | Quality management + + + + +
+
+

Quality management

+
+
+
+ +
+
+
+ +
+ +
+ +
+
+ +
+ + \ No newline at end of file diff --git a/danube/sai/saimod_dasense_quality_management/qualitymanagement.js b/danube/sai/saimod_dasense_quality_management/qualitymanagement.js new file mode 100644 index 0000000..5646bfe --- /dev/null +++ b/danube/sai/saimod_dasense_quality_management/qualitymanagement.js @@ -0,0 +1,50 @@ + +function init_saimod_dasense_quality_management(){ + + // auto-completion stuff + $('#search').typeahead({ + source: function (query, process) { + return $.get('./api.php?call=analysis&action=data&get=locality&by=name', { query: query, limit: 8, options: {flag:0} }, function (data) { + //console.log(data); + var source = new Backbone.Collection(data.result).models; + + // passing an array of objects + process( _.map(source, function (locality) { + return { + id: locality.get('localityid'), + full_name: locality.get('de_name') + ' (' + locality.get('en_name') + ')', + // these functions allows Bootstrap typehead to use this item in places where it was expecting a string + toString: function () { + return JSON.stringify(this); + }, + toLowerCase: function () { + return this.full_name.toLowerCase(); + }, + indexOf: function () { + return String.prototype.indexOf.apply(this.full_name, arguments); + }, + replace: function () { + return String.prototype.replace.apply(this.full_name, arguments); + } + }; + })); + }); + }, + display: 'full_name', + updater: function(itemString){ + var item = JSON.parse(itemString); + refreshMap(item.id); + return item.full_name; + } + }); + +} + +function refreshMap(localityID){ + $.get('./api.php?call=analysis&action=data&get=locality&by=id', { locality_id: localityID, include_geometry: 1, include_children: 1 }, function (data) { + console.log(data); + // @todo: refresh map -> current locality + children geometries + }); +} + +function destroy(){} \ No newline at end of file diff --git a/danube/sai/saimod_dasense_quality_management/saimod_dasense_quality_management.php b/danube/sai/saimod_dasense_quality_management/saimod_dasense_quality_management.php new file mode 100644 index 0000000..05d6480 --- /dev/null +++ b/danube/sai/saimod_dasense_quality_management/saimod_dasense_quality_management.php @@ -0,0 +1,12 @@ +Quality Management
  • ';} + public static function right_public(){return false;} + public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\system::getSystemDBInfo(), \SYSTEM\SECURITY\RIGHTS::SYS_SAI);} + public static function src_js(){return \SYSTEM\LOG\JsonResult::toString( + array( \SYSTEM\WEBPATH(new \PSAI(),'saimod_dasense_quality_management/qualitymanagement.js') + ));} + public static function src_css(){} +} \ No newline at end of file diff --git a/index.php b/index.php index a866244..cd30997 100644 --- a/index.php +++ b/index.php @@ -3,6 +3,7 @@ require_once '../system/autoload.inc.php'; //SYSTEM Classes require_once 'danube/autoload.inc.php'; //Project Classes require_once '../system/log/register_exception_shortcut.php'; //allow ERROR() instead of \SYSTEM\LOG\ERROR() +require_once '../system/log/register_errorhandler_dbwriter.php'; //write errors to db require_once '../system/log/register_errorhandler_jsonoutput.php'; //print errors as json to caller require_once 'config.php';