From bb54a0ae370f8341fced9f99efa0ad199c1f6524 Mon Sep 17 00:00:00 2001 From: rylon Date: Sat, 6 Jun 2015 14:51:34 +0200 Subject: [PATCH] 404 bootstrap link fixed, user todo stats, saistart user todo stats --- sai/modules/saimod_sys_mod/saimod_sys_mod.php | 4 ++++ sai/modules/saimod_sys_mod/tpl/mod_table.tpl | 5 +++++ sai/modules/saimod_sys_todo/autoload.inc | 3 ++- ..._SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php | 13 ++++++++++++ .../qq/SYS_SAIMOD_TODO_STATS_USERS.php | 19 +++++++++++++++++ .../saimod_sys_todo/saimod_sys_todo.php | 6 ++++++ .../stats/todo_stats_assign.php | 9 ++++++++ .../saimod_sys_todo/tpl/todo_stats.tpl | 21 ++++++++++++++----- .../tpl/todo_stats_users_entry.tpl | 7 +++++++ .../saistart_sys_sai/saistart_sys_sai.php | 6 ++++++ .../saistart_sys_sai/tpl/content_loggedin.tpl | 13 +++++++++++- sai/page/default_page.php | 2 +- 12 files changed, 100 insertions(+), 8 deletions(-) create mode 100644 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php create mode 100644 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_USERS.php create mode 100644 sai/modules/saimod_sys_todo/stats/todo_stats_assign.php create mode 100644 sai/modules/saimod_sys_todo/tpl/todo_stats_users_entry.tpl diff --git a/sai/modules/saimod_sys_mod/saimod_sys_mod.php b/sai/modules/saimod_sys_mod/saimod_sys_mod.php index d9fb925..4295fd8 100644 --- a/sai/modules/saimod_sys_mod/saimod_sys_mod.php +++ b/sai/modules/saimod_sys_mod/saimod_sys_mod.php @@ -13,6 +13,10 @@ class saimod_sys_mod extends \SYSTEM\SAI\SaiModule { $v['you'] = \call_user_func(array($mod, 'right_right')) ? '' : ''; $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/tpl/mod_tr.tpl'),$v); } + $mod = \SYSTEM\SAI\sai::getStartModule(); + $vars['start_class'] = $mod; + $vars['start_public'] = \call_user_func(array($mod, 'right_public')) ? '' : ''; + $vars['start_access'] = \call_user_func(array($mod, 'right_right')) ? '' : ''; return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/tpl/mod_table.tpl'),$vars); } diff --git a/sai/modules/saimod_sys_mod/tpl/mod_table.tpl b/sai/modules/saimod_sys_mod/tpl/mod_table.tpl index 9ee4d2d..ae369c7 100644 --- a/sai/modules/saimod_sys_mod/tpl/mod_table.tpl +++ b/sai/modules/saimod_sys_mod/tpl/mod_table.tpl @@ -4,5 +4,10 @@ Public You can Access? + + ${start_class} + ${start_public} + ${start_access} + ${entries} \ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/autoload.inc b/sai/modules/saimod_sys_todo/autoload.inc index 033c876..1838e6a 100644 --- a/sai/modules/saimod_sys_todo/autoload.inc +++ b/sai/modules/saimod_sys_todo/autoload.inc @@ -5,4 +5,5 @@ \SYSTEM\SAI\sai::register_sys('\SYSTEM\SAI\saimod_sys_todo'); \SYSTEM\SAI\saimod_sys_todo::register('\SYSTEM\SAI\todo_stats_gen'); -\SYSTEM\SAI\saimod_sys_todo::register('\SYSTEM\SAI\todo_stats_user'); \ No newline at end of file +\SYSTEM\SAI\saimod_sys_todo::register('\SYSTEM\SAI\todo_stats_user'); +\SYSTEM\SAI\saimod_sys_todo::register('\SYSTEM\SAI\todo_stats_assign'); \ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php new file mode 100644 index 0000000..9eb035f --- /dev/null +++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php @@ -0,0 +1,13 @@ +next()){ + $stat['perc'] = round($stat['state_closed'] / ($stat['state_open']+$stat['state_closed']),2)*100; + $vars['userstats'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats_users_entry.tpl'), $stat); + } return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats.tpl'), $vars); } diff --git a/sai/modules/saimod_sys_todo/stats/todo_stats_assign.php b/sai/modules/saimod_sys_todo/stats/todo_stats_assign.php new file mode 100644 index 0000000..9932515 --- /dev/null +++ b/sai/modules/saimod_sys_todo/stats/todo_stats_assign.php @@ -0,0 +1,9 @@ + - Name - Count - All - Done + ${table_name} + ${table_count} + ${table_all} + ${table_done} ${entries} - Project + ${table_project} ${project_count} ${project_all} ${project}% + + + + + + + + + + + ${userstats}
${table_username}${table_open}${table_closed}${table_percentage}${table_all}
\ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/tpl/todo_stats_users_entry.tpl b/sai/modules/saimod_sys_todo/tpl/todo_stats_users_entry.tpl new file mode 100644 index 0000000..380593a --- /dev/null +++ b/sai/modules/saimod_sys_todo/tpl/todo_stats_users_entry.tpl @@ -0,0 +1,7 @@ + + ${username} + ${state_open} + ${state_closed} + ${perc}% + ${count} + \ No newline at end of file diff --git a/sai/modules/saistart_sys_sai/saistart_sys_sai.php b/sai/modules/saistart_sys_sai/saistart_sys_sai.php index cace188..869dbc1 100644 --- a/sai/modules/saistart_sys_sai/saistart_sys_sai.php +++ b/sai/modules/saistart_sys_sai/saistart_sys_sai.php @@ -31,6 +31,12 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule { $vars['username'] = $user->username; $vars['locale'] = $user->locale; $vars['isadmin'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) ? "yes" : "no"; + $vars['userstats'] = ''; + $userstats = \SYSTEM\DBD\SYS_SAIMOD_TODO_STATS_USERS::QQ(); + while($stat = $userstats->next()){ + $stat['perc'] = round($stat['state_closed'] / ($stat['state_open']+$stat['state_closed']),2)*100; + $vars['userstats'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats_users_entry.tpl'), $stat); + } $vars = array_merge( $vars, \SYSTEM\SAI\saimod_sys_todo::statistics(), \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_START), diff --git a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl index c8d14df..9698f65 100644 --- a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl +++ b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl @@ -9,7 +9,18 @@
${basic_name}: ${project_name}
${basic_URL}: ${project_url}
- ${basic_progress}: ${project}% + ${basic_progress}: ${project}%
+
+ + + + + + + + + ${userstats} +
${table_username}${table_open}${table_closed}${table_percentage}${table_all}
diff --git a/sai/page/default_page.php b/sai/page/default_page.php index 31ad6ae..bd7a418 100644 --- a/sai/page/default_page.php +++ b/sai/page/default_page.php @@ -40,7 +40,7 @@ class default_page extends \SYSTEM\PAGE\Page { private static function js(){ $result = ''. - ''. + //''. ''. ''. ''.