webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

statesystem improvement working pretty good now ;-) including variables for calls

Browse Source
This commit is contained in:
Ulf Gebhardt 2015-01-23 15:54:41 +01:00
parent 96078ca1bd
commit a472c51a09
7 changed files with 62 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/api_system.php
View File

@ -12,8 +12,8 @@ class api_system extends api_login{
public static function call_files($cat,$id = null){ public static function call_files($cat,$id = null){
return \SYSTEM\FILES\files::get($cat, $id, true);} return \SYSTEM\FILES\files::get($cat, $id, true);}
public static function call_pages($group){ public static function call_pages($group,$state){
return \SYSTEM\PAGE\State::get($group);} return \SYSTEM\PAGE\State::get($group,$state);}
public static function static__lang($lang){ public static function static__lang($lang){
\SYSTEM\locale::set($lang);} \SYSTEM\locale::set($lang);}

2
dbd/qq/SYS_PAGE_GROUP.php
View File

@ -7,9 +7,11 @@ class SYS_PAGE_GROUP extends \SYSTEM\DB\QP {
//pg //pg
'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_PG 'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_PG
.' WHERE "'.\SYSTEM\DBD\system_page::FIELD_GROUP.'" = $1' .' WHERE "'.\SYSTEM\DBD\system_page::FIELD_GROUP.'" = $1'
.' AND "'.\SYSTEM\DBD\system_page::FIELD_ID.'" = $2'
.' ORDER BY "'.\SYSTEM\DBD\system_page::FIELD_ID.'"', .' ORDER BY "'.\SYSTEM\DBD\system_page::FIELD_ID.'"',
//mys //mys
'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_MYS 'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_MYS
.' WHERE `'.\SYSTEM\DBD\system_page::FIELD_GROUP.'` = ?' .' WHERE `'.\SYSTEM\DBD\system_page::FIELD_GROUP.'` = ?'
.' AND `'.\SYSTEM\DBD\system_page::FIELD_ID.'` = ?'
.' ORDER BY '.\SYSTEM\DBD\system_page::FIELD_ID .' ORDER BY '.\SYSTEM\DBD\system_page::FIELD_ID
);}} );}}

7
dbd/sql/mysql/data/sai_api.sql
View File

@ -21,9 +21,10 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (31, 42, 3, 30, 'files', 'id', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (31, 42, 3, 30, 'files', 'id', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (40, 42, 2, 10, 'text', 'request', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (40, 42, 2, 10, 'text', 'request', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 42, 2, 40, 'text', 'lang', 'LANG'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 42, 2, 40, 'text', 'lang', 'LANG');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (50, 42, 2, 10, 'pagestates', 'group', 'UINT'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (50, 42, 2, 10, 'pages', 'group', 'UINT');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (51, 42, 1, 50, NULL, 'js', NULL); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (51, 42, 2, 10, 'pages', 'state', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (52, 42, 2, 51, NULL, 'group', 'UINT'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (52, 42, 1, 50, NULL, 'js', NULL);
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (53, 42, 2, 51, NULL, 'group', 'UINT');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (55, 42, 1, 50, NULL, 'css', NULL); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (55, 42, 1, 50, NULL, 'css', NULL);
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (56, 42, 2, 55, NULL, 'group', 'UINT'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (56, 42, 2, 55, NULL, 'group', 'UINT');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (90, 42, 4, -1, NULL, '_lang', 'LANG'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (90, 42, 4, -1, NULL, '_lang', 'LANG');

1
dbd/sql/mysql/data/system_api.sql
View File

@ -19,6 +19,7 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 0, 2, 10, 'text', 'lang', 'LANG'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 0, 2, 10, 'text', 'lang', 'LANG');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (50, 0, 2, 10, 'pages', 'group', 'UINT'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (50, 0, 2, 10, 'pages', 'group', 'UINT');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (51, 0, 2, 10, 'pages', 'state', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (90, 0, 4, -1, NULL, '_lang', 'LANG'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (90, 0, 4, -1, NULL, '_lang', 'LANG');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (91, 0, 4, -1, NULL, '_result', 'RESULT'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (91, 0, 4, -1, NULL, '_result', 'RESULT');

5
dbd/sql/mysql/schema/system_page.sql
View File

@ -4,7 +4,8 @@ CREATE TABLE `system_page` (
`div` CHAR(50) NOT NULL, `div` CHAR(50) NOT NULL,
`url` TEXT NOT NULL, `url` TEXT NOT NULL,
`func` CHAR(50) NOT NULL, `func` CHAR(50) NOT NULL,
`php_class` CHAR(50) NOT NULL,
PRIMARY KEY (`id`, `div`, `group`) PRIMARY KEY (`id`, `div`, `group`)
) )
COLLATE='utf8_general_ci' COLLATE='utf8_unicode_ci'
ENGINE=InnoDB; ENGINE=InnoDB;

96
files/sys/system.js
View File

@ -15,14 +15,48 @@ function SYSTEM(endpoint, group,start_state){
this.go_state(start_state); this.go_state(start_state);
} }
//internal function to handle pagestate results //internal function to handle pagestate results
SYSTEM.prototype.handle_call_pages = function (data) { SYSTEM.prototype.handle_call_pages = function (data,id) {
if(data['status']){ if(data['status']){
newps = data['result']; system.log(system.LOG_INFO,'load pages: endpoint '+system.endpoint+':group '+system.group+':state '+id+' - success');
system.log(system.LOG_INFO,'load pages: '+system.endpoint+':'+system.group+' - success'); window.history.pushState(null, "", '#'+id);
result = true; data['result'].forEach(function(entry) {
//load pages
$.ajax({
async: false,
data: {},
dataType: 'html',
url: entry['url']+'&'+window.location.search.substr(1),
success: function(data){
$(entry['div']).html(data);
system.log(system.LOG_INFO,'load page: '+id+entry['div']+' '+entry['url']+'&'+window.location.search.substr(1)+' - success');},
error: function(XMLHttpRequest, textStatus, errorThrown){system.log(system.LOG_ERROR,errorThrown);}
});
//load css
for(var i=0; i < entry['css'].length; i++){
system.load_css(entry['css'][i]);}
//load js
var call_func = true;
var loaded = 0;
for(var i=0; i < entry['js'].length; i++){
system.log(system.LOG_INFO,'load js: '+entry['js'][i]);
$.getScript(entry['js'][i]).done(function(response, status) {
system.log(system.LOG_INFO,'load js: '+status);
if(loaded++ == entry['js'].length-1){
var fn = window[entry['func']];
if(call_func && typeof fn === 'function'){
call_func = false;
fn();
system.log(system.LOG_INFO,'call func: '+entry['func']);
} else {
system.log(system.LOG_ERROR,'call func: '+entry['func']+' - fail');
}}
});
}
});
} else { } else {
console.log(data);
system.log(system.LOG_INFO,'Problem with your Pages: '+data['result']['message']); system.log(system.LOG_INFO,'Problem with your Pages: '+data['result']['message']);
result = false;} }
}; };
//send a call to the endpoint //send a call to the endpoint
SYSTEM.prototype.call = function(call,success,data,data_type,async){ SYSTEM.prototype.call = function(call,success,data,data_type,async){
@ -63,57 +97,7 @@ SYSTEM.prototype.load_page = function(){
//load a pagestatewith given id //load a pagestatewith given id
SYSTEM.prototype.load = function(id){ SYSTEM.prototype.load = function(id){
system.log(system.LOG_START,'load page '+id); system.log(system.LOG_START,'load page '+id);
if(!system.load_page()){ this.call('call=pages&group='+this.group+'&state='+id,function(data){system.handle_call_pages(data,id);},{},"json",false);};
system.log(system.LOG_ERROR,'Problem with your Pages');
return false;}
var push = true;
var found = false;
system.pages.forEach(function(entry) {
if(entry['id'] === id){
found = true;
//write new state
if(push){
window.history.pushState(null, "", '#'+id);
push = false;}
//load pages
$.ajax({
async: false,
data: {},
dataType: 'html',
url: entry['url']+'&'+window.location.search.substr(1),
success: function(data){
$(entry['div']).html(data);
system.log(system.LOG_INFO,'load page: '+id+entry['div']+' '+entry['url']+'&'+window.location.search.substr(1)+' - success');},
error: function(XMLHttpRequest, textStatus, errorThrown){system.log(system.LOG_ERROR,errorThrown);}
});
//load css
for(var i=0; i < entry['css'].length; i++){
system.load_css(entry['css'][i]);}
//load js
var call_func = true;
var loaded = 0;
for(var i=0; i < entry['js'].length; i++){
system.log(system.LOG_INFO,'load js: '+entry['js'][i]);
$.getScript(entry['js'][i]).done(function(response, status) {
system.log(system.LOG_INFO,'load js: '+status);
if(loaded++ == entry['js'].length-1){
var fn = window[entry['func']];
if(call_func && typeof fn === 'function'){
call_func = false;
fn();
system.log(system.LOG_INFO,'call func: '+entry['func']);
} else {
system.log(system.LOG_ERROR,'call func: '+entry['func']+' - fail');
}}
});
}
}
});
if(!found){
window.history.pushState(null, "", '#');
window.location.reload();}
return push ? false : true;
};
SYSTEM.prototype.load_css = function loadCSS(csssrc) { SYSTEM.prototype.load_css = function loadCSS(csssrc) {
var snode = document.createElement('link'); var snode = document.createElement('link');

16
page/State.php
View File

@ -1,16 +1,20 @@
<?php <?php
namespace SYSTEM\PAGE; namespace SYSTEM\PAGE;
class State { class State {
public static function get($group){ public static function get($group,$state){
$state = \explode(';', $state);
$vars = array();
for($i=1;$i<count($state);$i++){
$var = \explode('.',$state[$i]);
$vars[$var[0]] = $var[1];}
$result = array(); $result = array();
$res = \SYSTEM\DBD\SYS_PAGE_GROUP::QQ(array($group,$state[0]));
$res = \SYSTEM\DBD\SYS_PAGE_GROUP::QQ(array($group));
while($row = $res->next()){ while($row = $res->next()){
$row['url'] = \SYSTEM\PAGE\replace::replace($row['url'], $vars);
$row['css'] = $row['js'] = array(); $row['css'] = $row['js'] = array();
if(\class_exists($row['php_class']) && \method_exists($row['php_class'], 'css') && \is_callable($row['php_class'].'::css')){ if(/*\is_callable($row['php_class']) &&*/ \class_exists($row['php_class']) && \method_exists($row['php_class'], 'css') && \is_callable($row['php_class'].'::css')){
$row['css'] = array_merge($row['css'], call_user_func($row['php_class'].'::css'));} $row['css'] = array_merge($row['css'], call_user_func($row['php_class'].'::css'));}
if(\class_exists($row['php_class']) && \method_exists($row['php_class'], 'js') && \is_callable($row['php_class'].'::js')){ if(/*\is_callable($row['php_class']) &&*/ \class_exists($row['php_class']) && \method_exists($row['php_class'], 'js') && \is_callable($row['php_class'].'::js')){
$row['js'] = array_merge($row['js'], call_user_func($row['php_class'].'::js'));} $row['js'] = array_merge($row['js'], call_user_func($row['php_class'].'::js'));}
$result[] = $row;} $result[] = $row;}
return \SYSTEM\LOG\JsonResult::toString($result);} return \SYSTEM\LOG\JsonResult::toString($result);}