Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #9118.

Browse Source
This commit is contained in:
holan20180123
2021-01-28 14:46:12 +08:00
parent d8ac5728d8
commit c26a63e7fb
17 changed files with 104 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/company/view/browse.html.php
View File

@@ -92,7 +92,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
<?php printf('%03d', $user->id);?>
<?php endif;?>
</td>
<td><?php if(!common::printLink('user', 'view', "userID=$user->id", $user->realname, '', "title='$user->realname'")) echo $user->realname;?></td>
<td title="<?php echo $user->realname;?>"><?php echo $user->realname;?></td>
<td><?php echo $user->account;?></td>
<td class="w-90px" title='<?php echo zget($lang->user->roleList, $user->role, '');?>'><?php echo zget($lang->user->roleList, $user->role, '');?></td>
<td class="c-url" title="<?php echo $user->email;?>"><?php echo html::mailto($user->email);?></td>

4
module/index/js/index.js
View File

@@ -118,7 +118,9 @@
return 'project';
}
}
if(moduleName === 'user' && (link.params.fromModule || link.params.$2) == 'my') return 'my';
var myMethods = 'todocalendar|effortcalendar|todo|task|story|bug|testtask|testcase|execution|issue|risk|dynamic|profile';
if(moduleName === 'user' && myMethods.indexOf(methodLowerCase) != -1) return 'my';
group = window.navGroup[moduleName] || moduleName || urlOrModuleName;
return groupsMap[group] ? group : '';

121
module/user/control.php
View File

@@ -33,20 +33,18 @@ class user extends control
* View a user.
*
* @param string $userID
* @param string $fromModule
* @access public
* @return void
*/
public function view($userID, $fromModule = 'user')
public function view($userID)
{
$this->locate($this->createLink('user', 'todo', "userID=$userID&fromModule=$fromModule"));
$this->locate($this->createLink('user', 'todo', "userID=$userID"));
}
/**
* Todos of a user.
*
* @param string $userID
* @param string $fromModule
* @param string $type the todo type, today|lastweek|thisweek|all|undone, or a date.
* @param string $status
* @param string $orderBy
@@ -56,7 +54,7 @@ class user extends control
* @access public
* @return void
*/
public function todo($userID, $fromModule = 'user', $type = 'today', $status = 'all', $orderBy='date,status,begin', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function todo($userID, $type = 'today', $status = 'all', $orderBy='date,status,begin', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$user = $this->user->getById($userID, 'id');
if(empty($user)) die(js::error($this->lang->notFound) . js::locate('back'));
@@ -78,19 +76,18 @@ class user extends control
$account = $user->account;
$todos = $this->todo->getList($type, $account, $status, 0, $pager, $sort);
$date = (int)$type == 0 ? helper::today() : $type;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
/* Change the menu when in my module. */
$this->resetMenu($fromModule);
$this->resetMenu();
/* set menus. */
$this->lang->set('menugroup.user', 'company');
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
$this->view->userList = $this->user->setUserList($users, $userID);
$this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->todo;
$this->view->position[] = $this->lang->user->todo;
$this->view->tabID = 'todo';
$this->view->fromModule = $fromModule;
$this->view->date = $date;
$this->view->todos = $todos;
$this->view->user = $user;
@@ -106,7 +103,6 @@ class user extends control
* Story of a user.
*
* @param int $userID
* @param string $fromModule
* @param string $storyType
* @param string $type
* @param int $recTotal
@@ -115,7 +111,7 @@ class user extends control
* @access public
* @return void
*/
public function story($userID, $fromModule = 'user', $storyType = 'story', $type = 'assignedTo', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function story($userID, $storyType = 'story', $type = 'assignedTo', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session. */
$this->session->set('storyList', $this->app->getURI(true));
@@ -126,25 +122,24 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
/* Set menu. */
$this->lang->set('menugroup.user', 'company');
/* Change the menu when in my module. */
$this->resetMenu($fromModule);
$this->resetMenu();
/* Assign. */
$this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->story;
$this->view->position[] = $this->lang->user->story;
$this->view->stories = $this->loadModel('story')->getUserStories($account, $type, 'id_desc', $pager, $storyType);
$this->view->users = $this->user->getPairs('noletter');
$this->view->fromModule = $fromModule;
$this->view->storyType = $storyType;
$this->view->type = $type;
$this->view->user = $user;
$this->view->pager = $pager;
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
$this->view->userList = $this->user->setUserList($users, $userID);
$this->display();
}
@@ -153,7 +148,6 @@ class user extends control
* Tasks of a user.
*
* @param int $userID
* @param string $fromModule
* @param string $type
* @param int $recTotal
* @param int $recPerPage
@@ -161,7 +155,7 @@ class user extends control
* @access public
* @return void
*/
public function task($userID, $fromModule = 'user', $type = 'assignedTo', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function task($userID, $type = 'assignedTo', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save the session. */
$this->session->set('taskList', $this->app->getURI(true));
@@ -172,21 +166,20 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
/* Set the menu. */
$this->lang->set('menugroup.user', 'company');
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
$this->view->userList = $this->user->setUserList($users, $userID);
/* Change the menu when in my module. */
$this->resetMenu($fromModule);
$this->resetMenu();
/* Assign. */
$this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->task;
$this->view->position[] = $this->lang->user->task;
$this->view->tabID = 'task';
$this->view->tasks = $this->loadModel('task')->getUserTasks($account, $type, 0, $pager);
$this->view->fromModule = $fromModule;
$this->view->type = $type;
$this->view->user = $user;
$this->view->pager = $pager;
@@ -198,7 +191,6 @@ class user extends control
* User bugs.
*
* @param int $userID
* @param string $fromModule
* @param string $type
* @param string $orderBy
* @param int $recTotal
@@ -207,7 +199,7 @@ class user extends control
* @access public
* @return void
*/
public function bug($userID, $fromModule = 'user', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function bug($userID, $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save the session. */
$this->session->set('bugList', $this->app->getURI(true));
@@ -218,23 +210,22 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
/* Set menu. */
$this->lang->set('menugroup.user', 'company');
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
$this->view->userList = $this->user->setUserList($users, $userID);
/* Load the lang of bug module. */
$this->app->loadLang('bug');
/* Change the menu when in my module. */
$this->resetMenu($fromModule);
$this->resetMenu();
$this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->bug;
$this->view->position[] = $this->lang->user->bug;
$this->view->tabID = 'bug';
$this->view->bugs = $this->loadModel('bug')->getUserBugs($account, $type, $orderBy, 0, $pager);
$this->view->fromModule = $fromModule;
$this->view->type = $type;
$this->view->user = $user;
$this->view->users = $this->user->getPairs('noletter');
@@ -247,7 +238,6 @@ class user extends control
* User's testtask
*
* @param int $userID
* @param string $fromModule
* @param string $orderBy
* @param int $recTotal
* @param int $recPerPage
@@ -255,7 +245,7 @@ class user extends control
* @access public
* @return void
*/
public function testtask($userID, $fromModule = 'user', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function testtask($userID, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -263,11 +253,11 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
/* Set menu. */
$this->lang->set('menugroup.user', 'company');
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
$this->view->userList = $this->user->setUserList($users, $userID);
/* Save session. */
$this->session->set('testtaskList', $this->app->getURI(true));
@@ -278,14 +268,13 @@ class user extends control
$sort = $this->loadModel('common')->appendOrder($orderBy);
/* Change the menu when in my module. */
$this->resetMenu($fromModule);
$this->resetMenu();
$this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->testTask;
$this->view->position[] = $this->lang->user->testTask;
$this->view->tasks = $this->loadModel('testtask')->getByUser($account, $pager, $sort);
$this->view->users = $this->user->getPairs('noletter');
$this->view->user = $user;
$this->view->fromModule = $fromModule;
$this->view->recTotal = $recTotal;
$this->view->recPerPage = $recPerPage;
$this->view->pageID = $pageID;
@@ -298,7 +287,6 @@ class user extends control
* User's test case.
*
* @param int $userID
* @param string $fromModule
* @param string $type
* @param string $orderBy
* @param int $recTotal
@@ -307,7 +295,7 @@ class user extends control
* @access public
* @return void
*/
public function testcase($userID, $fromModule = 'user', $type = 'case2Him', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function testcase($userID, $type = 'case2Him', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session, load lang. */
$this->session->set('caseList', $this->app->getURI(true));
@@ -319,7 +307,7 @@ class user extends control
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
/* Append id for secend sort. */
$sort = $this->loadModel('common')->appendOrder($orderBy);
@@ -328,7 +316,7 @@ class user extends control
$this->lang->set('menugroup.user', 'company');
/* Change the menu when in my module. */
$this->resetMenu($fromModule);
$this->resetMenu();
$cases = array();
if($type == 'case2Him')
@@ -348,14 +336,13 @@ class user extends control
$this->view->cases = $cases;
$this->view->users = $this->user->getPairs('noletter');
$this->view->tabID = 'test';
$this->view->fromModule = $fromModule;
$this->view->type = $type;
$this->view->recTotal = $recTotal;
$this->view->recPerPage = $recPerPage;
$this->view->pageID = $pageID;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
$this->view->userList = $this->user->setUserList($users, $userID);
$this->display();
}
@@ -364,21 +351,20 @@ class user extends control
* User executions.
*
* @param int $userID
* @param string $fromModule
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
* @access public
* @return void
*/
public function execution($userID, $fromModule = 'user', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function execution($userID, $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$uri = $this->app->getURI(true);
$this->session->set('projectList', $uri);
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -387,14 +373,13 @@ class user extends control
/* Set the menus. */
$this->loadModel('project');
$this->lang->set('menugroup.user', 'company');
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
$this->view->userList = $this->user->setUserList($users, $userID);
/* Change the menu when in my module. */
$this->resetMenu($fromModule);
$this->resetMenu();
$this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->execution;
$this->view->position[] = $this->lang->user->execution;
$this->view->fromModule = $fromModule;
$this->view->tabID = 'project';
$this->view->executions = $this->user->getProjects($account, array('sprint', 'stage'), 'all', $pager);
$this->view->user = $user;
@@ -407,7 +392,6 @@ class user extends control
* User issues.
*
* @param int $userID
* @param string $fromModule
* @param string $type
* @param string $orderBy
* @param int $recTotal
@@ -416,14 +400,14 @@ class user extends control
* @access public
* @return void
*/
public function issue($userID, $fromModule = 'user', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function issue($userID, $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$uri = $this->app->getURI(true);
$this->session->set('issueList', $uri);
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -431,14 +415,13 @@ class user extends control
/* Set the menus. */
$this->lang->set('menugroup.user', 'company');
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
$this->view->userList = $this->user->setUserList($users, $userID);
/* Change the menu when in my module. */
$this->resetMenu($fromModule);
$this->resetMenu();
$this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->issue;
$this->view->position[] = $this->lang->user->issue;
$this->view->fromModule = $fromModule;
$this->view->issues = $this->loadModel('issue')->getUserIssues($type, $account, $orderBy, $pager);
$this->view->user = $user;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
@@ -453,7 +436,6 @@ class user extends control
* User risks.
*
* @param int $userID
* @param string $fromModule
* @param string $type
* @param string $orderBy
* @param int $recTotal
@@ -462,14 +444,14 @@ class user extends control
* @access public
* @return void
*/
public function risk($userID, $fromModule = 'user', $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function risk($userID, $type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$uri = $this->app->getURI(true);
$this->session->set('riskList', $uri);
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -477,14 +459,13 @@ class user extends control
/* Set the menus. */
$this->lang->set('menugroup.user', 'company');
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
$this->view->userList = $this->user->setUserList($users, $userID);
/* Change the menu when in my module. */
$this->resetMenu($fromModule);
$this->resetMenu();
$this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->risk;
$this->view->position[] = $this->lang->user->risk;
$this->view->fromModule = $fromModule;
$this->view->risks = $this->loadModel('risk')->getUserRisks($type, $account, $orderBy, $pager);
$this->view->user = $user;
$this->view->type = $type;
@@ -498,30 +479,28 @@ class user extends control
* The profile of a user.
*
* @param int $userID
* @param string $fromModule
* @access public
* @return void
*/
public function profile($userID = '', $fromModule = 'user')
public function profile($userID = '')
{
if(empty($userID)) $userID = $this->app->user->id;
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
/* Change the menu when in my module. */
$this->resetMenu($fromModule);
$this->resetMenu();
$this->view->title = "USER #$user->id $user->account/" . $this->lang->user->profile;
$this->view->position[] = $this->lang->user->common;
$this->view->position[] = $this->lang->user->profile;
$this->view->user = $user;
$this->view->fromModule = $fromModule;
$this->view->groups = $this->loadModel('group')->getByAccount($account);
$this->view->deptPath = $this->dept->getParents($user->dept);
$this->view->personalData = $this->user->getPersonalData($user->account);
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
$this->view->userList = $this->user->setUserList($users, $userID);
$this->display();
}
@@ -1092,7 +1071,6 @@ class user extends control
* User dynamic.
*
* @param int $userID
* @param string $fromModule
* @param string $period
* @param int $recTotal
* @param string $date
@@ -1100,15 +1078,15 @@ class user extends control
* @access public
* @return void
*/
public function dynamic($userID = '', $fromModule = 'user', $period = 'today', $recTotal = 0, $date = '', $direction = 'next')
public function dynamic($userID = '', $period = 'today', $recTotal = 0, $date = '', $direction = 'next')
{
$user = $this->user->getById($userID, 'id');
$account = $user->account;
$users = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
$users = $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
/* set menus. */
$this->lang->set('menugroup.user', 'company');
$this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
$this->view->userList = $this->user->setUserList($users, $userID);
/* Save session. */
$uri = $this->app->getURI(true);
@@ -1133,7 +1111,7 @@ class user extends control
$date = empty($date) ? '' : date('Y-m-d', $date);
/* Change the menu when in my module. */
$this->resetMenu($fromModule);
$this->resetMenu();
$actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', 'all', $date, $direction);
@@ -1145,7 +1123,6 @@ class user extends control
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->pager = $pager;
$this->view->user = $user;
$this->view->fromModule = $fromModule;
$this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $period);
$this->view->direction = $direction;
$this->display();
@@ -1154,18 +1131,14 @@ class user extends control
/**
* Reset menu when from my module.
*
* @param string $fromModule
* @access public
* @return void
*/
public function resetMenu($fromModule = 'user')
{
if($fromModule == 'my')
public function resetMenu()
{
$this->lang->admin->menu = $this->lang->my->menu;
$this->lang->noMenuModule[] = 'user';
}
}
/**
* crop avatar

2
module/user/css/profile.css
View File

@@ -6,7 +6,7 @@
.user-title{margin: 10px 10px -10px 10px; font-size: 14px; font-weight: bold; padding-left: 10px;}
.avatar{display: inline-block; width: 50px; height: 50px; line-height: 50px;}
.user-name{margin-left: 15px}
.user-name, .user-role{font-size: 16px; vertical-align: top;}
.user-name, .user-role{font-size: 16px; vertical-align: top; line-height: 50px;}
.line{border-top: 1px solid #eee; margin: 10px;}
#avatarUploadBtn{padding: 4px 12px; position: relative; left: 32px; bottom: 30px;}
#avatarForm{height: 10px}

8
module/user/js/common.js
View File

@@ -19,19 +19,19 @@ $(document).ready(function()
});
});
function switchAccount(account, method, fromModule)
function switchAccount(account, method)
{
if(method == 'dynamic')
{
link = createLink('user', method, 'account=' + account + '&fromModule=' + fromModule + '&period=' + period);
link = createLink('user', method, 'account=' + account + '&period=' + period);
}
else if(method == 'todo')
{
link = createLink('user', method, 'account=' + account + '&fromModule=' + fromModule + '&type=' + type);
link = createLink('user', method, 'account=' + account + '&type=' + type);
}
else
{
link = createLink('user', method, 'account=' + account + '&fromModule=' + fromModule);
link = createLink('user', method, 'account=' + account);
}
location.href=link;
}

2
module/user/js/todo.js
View File

@@ -1,6 +1,6 @@
function changeDate(date)
{
location.href = createLink('user', 'todo', 'userID=' + userID + 'from=' + from + '&type=' + date.replace(/\-/g, ''));
location.href = createLink('user', 'todo', 'userID=' + userID + '&type=' + date.replace(/\-/g, ''));
}
$(function()

5
module/user/model.php
View File

@@ -18,18 +18,17 @@ class userModel extends model
*
* @param array $users
* @param string $account
* @param string $fromModule
* @access public
* @return html
*/
public function setUserList($users, $account, $fromModule = 'user')
public function setUserList($users, $account)
{
if(!isset($users[$account]))
{
$user = $this->getById($account);
if($user and $user->deleted) $users[$account] = zget($user, 'realname', $account);
}
return html::select('account', $users, $account, "onchange=\"switchAccount(this.value, '{$this->app->getMethodName()}', '{$fromModule}')\" class='form-control chosen'");
return html::select('account', $users, $account, "onchange=\"switchAccount(this.value, '{$this->app->getMethodName()}')\" class='form-control chosen'");
}
/**

8
module/user/view/bug.html.php
View File

@@ -19,16 +19,16 @@
<?php
$that = zget($lang->user->thirdPerson, $user->gender);
$active = $type == 'assignedTo' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('bug', "userID={$user->id}&fromModule=$fromModule&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('bug', "userID={$user->id}&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
$active = $type == 'openedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('bug', "userID={$user->id}&fromModule=$fromModule&type=openedBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('bug', "userID={$user->id}&type=openedBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
$active = $type == 'resolvedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('bug', "userID={$user->id}&fromModule=$fromModule&type=resolvedBy"), sprintf($lang->user->resolvedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('bug', "userID={$user->id}&type=resolvedBy"), sprintf($lang->user->resolvedBy, $that)) . "</li>";
$active = $type == 'closedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('bug', "userID={$user->id}&fromModule=$fromModule&type=closedBy"), sprintf($lang->user->closedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('bug', "userID={$user->id}&type=closedBy"), sprintf($lang->user->closedBy, $that)) . "</li>";
?>
</ul>
</nav>

2
module/user/view/dynamic.html.php
View File

@@ -25,7 +25,7 @@
$active = 'btn-active-text';
$label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
}
echo html::a(inlink('dynamic', "userID={$user->id}&fromModule=$fromModule&type=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
echo html::a(inlink('dynamic', "userID={$user->id}&type=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
?>
<?php endforeach;?>
</div>

24
module/user/view/featurebar.html.php
View File

@@ -10,51 +10,51 @@
$label = "<span class='text'>{$lang->user->schedule}</span>";
$active = $methodName == 'todo' ? ' btn-active-text' : '';
common::printLink('user', 'todo', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'todo', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->user->task}</span>";
$active = $methodName == 'task' ? ' btn-active-text' : '';
common::printLink('user', 'task', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'task', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->URCommon}</span>";
$active = ($methodName == 'story' and $storyType == 'requirement') ? ' btn-active-text' : '';
common::printLink('user', 'story', "userID={$user->id}&fromModule=$fromModule&storyType=requirement", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'story', "userID={$user->id}&storyType=requirement", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->SRCommon}</span>";
$active = ($methodName == 'story' and $storyType == 'story') ? ' btn-active-text' : '';
common::printLink('user', 'story', "userID={$user->id}&fromModule=$fromModule&storyType=story", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'story', "userID={$user->id}&storyType=story", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->user->bug}</span>";
$active = $methodName == 'bug' ? ' btn-active-text' : '';
common::printLink('user', 'bug', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'bug', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->user->testTask}</span>";
$active = $methodName == 'testtask' ? ' btn-active-text' : '';
common::printLink('user', 'testtask', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'testtask', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->user->testCase}</span>";
$active = $methodName == 'testcase' ? ' btn-active-text' : '';
common::printLink('user', 'testcase', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'testcase', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->user->execution}</span>";
$active = $methodName == 'execution' ? ' btn-active-text' : '';
common::printLink('user', 'execution', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'execution', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->user->issue}</span>";
$active = ($methodName == 'issue' or $methodName == 'issue')? ' btn-active-text' : '';
common::printLink('user', 'issue', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'issue', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->user->risk}</span>";
$active = ($methodName == 'risk' or $methodName == 'risk')? ' btn-active-text' : '';
common::printLink('user', 'risk', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'risk', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->user->dynamic}</span>";
$active = $methodName == 'dynamic' ? ' btn-active-text' : '';
common::printLink('user', 'dynamic', "userID={$user->id}&fromModule=$fromModule&type=today", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'dynamic', "userID={$user->id}&type=today", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->user->profile}</span>";
$active = $methodName == 'profile' ? ' btn-active-text' : '';
common::printLink('user', 'profile', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'");
common::printLink('user', 'profile', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
?>
</div>
</div>

8
module/user/view/issue.html.php
View File

@@ -19,20 +19,20 @@
<?php
$that = zget($lang->user->thirdPerson, $user->gender);
$active = $type == 'assignedTo' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('issue', "userID={$user->id}&fromModule=$fromModule&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('issue', "userID={$user->id}&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
$active = $type == 'createdBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('issue', "userID={$user->id}&fromModule=$fromModule&type=createdBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('issue', "userID={$user->id}&type=createdBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
$active = $type == 'closedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('issue', "userID={$user->id}&fromModule=$fromModule&type=closedBy"), sprintf($lang->user->closedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('issue', "userID={$user->id}&type=closedBy"), sprintf($lang->user->closedBy, $that)) . "</li>";
?>
</ul>
</nav>
<div class='main-table'>
<table class="table has-sort-head table-fixed" id='issuetable'>
<?php $vars = "userID={$user->id}&fromModule=$fromModule&type=$type&orderBy=%s&recTotal=$pager->recTotal&recPerPage=$pager->recPerPage&pageID=$pager->pageID"; ?>
<?php $vars = "userID={$user->id}&type=$type&orderBy=%s&recTotal=$pager->recTotal&recPerPage=$pager->recPerPage&pageID=$pager->pageID"; ?>
<thead>
<tr>
<th class="c-id w-50px"><?php echo common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>

10
module/user/view/risk.html.php
View File

@@ -24,23 +24,23 @@
<?php
$that = zget($lang->user->thirdPerson, $user->gender);
$active = $type == 'assignedTo' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('risk', "userID={$user->id}&fromModule=$fromModule&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('risk', "userID={$user->id}&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
$active = $type == 'createdBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('risk', "userID={$user->id}&fromModule=$fromModule&type=createdBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('risk', "userID={$user->id}&type=createdBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
$active = $type == 'resolvedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('risk', "userID={$user->id}&fromModule=$fromModule&type=resolvedBy"), sprintf($lang->user->resolvedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('risk', "userID={$user->id}&type=resolvedBy"), sprintf($lang->user->resolvedBy, $that)) . "</li>";
$active = $type == 'closedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('risk', "userID={$user->id}&fromModule=$fromModule&type=closedBy"), sprintf($lang->user->closedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('risk', "userID={$user->id}&type=closedBy"), sprintf($lang->user->closedBy, $that)) . "</li>";
?>
</ul>
</nav>
<div class='main-table'>
<table class="table has-sort-head table-fixed" id='risktable'>
<?php $vars = "userID={$user->id}&fromModule=$fromModule&type=$type&orderBy=%s&recTotal=$pager->recTotal&recPerPage=$pager->recPerPage&pageID=$pager->pageID"; ?>
<?php $vars = "userID={$user->id}&type=$type&orderBy=%s&recTotal=$pager->recTotal&recPerPage=$pager->recPerPage&pageID=$pager->pageID"; ?>
<thead>
<tr>
<th class='text-left w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->risk->id);?></th>

8
module/user/view/story.html.php
View File

@@ -19,16 +19,16 @@
<?php
$that = zget($lang->user->thirdPerson, $user->gender);
$active = $type == 'assignedTo' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&storyType=$storyType&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('story', "userID={$user->id}&storyType=$storyType&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
$active = $type == 'openedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&storyType=$storyType&type=openedBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('story', "userID={$user->id}&storyType=$storyType&type=openedBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
$active = $type == 'reviewedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&storyType=$storyType&type=reviewedBy"), sprintf($lang->user->reviewedBy ,$that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('story', "userID={$user->id}&storyType=$storyType&type=reviewedBy"), sprintf($lang->user->reviewedBy ,$that)) . "</li>";
$active = $type == 'closedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&storyType=$storyType&type=closedBy"), sprintf($lang->user->closedBy ,$that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('story', "userID={$user->id}&storyType=$storyType&type=closedBy"), sprintf($lang->user->closedBy ,$that)) . "</li>";
?>
</ul>
</nav>

10
module/user/view/task.html.php
View File

@@ -19,19 +19,19 @@
<?php
$that = zget($lang->user->thirdPerson, $user->gender);
$active = $type == 'assignedTo' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('task', "userID={$user->id}&fromModule=$fromModule&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('task', "userID={$user->id}&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "</li>";
$active = $type == 'openedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('task', "userID={$user->id}&fromModule=$fromModule&type=openedBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('task', "userID={$user->id}&type=openedBy"), sprintf($lang->user->openedBy, $that)) . "</li>";
$active = $type == 'finishedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('task', "userID={$user->id}&fromModule=$fromModule&type=finishedBy"), sprintf($lang->user->finishedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('task', "userID={$user->id}&type=finishedBy"), sprintf($lang->user->finishedBy, $that)) . "</li>";
$active = $type == 'closedBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('task', "userID={$user->id}&fromModule=$fromModule&type=closedBy"), sprintf($lang->user->closedBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('task', "userID={$user->id}&type=closedBy"), sprintf($lang->user->closedBy, $that)) . "</li>";
$active = $type == 'canceledBy' ? 'active' : '';
echo "<li class='$active'>" . html::a(inlink('task', "userID={$user->id}&fromModule=$fromModule&type=canceledBy"), sprintf($lang->user->canceledBy, $that)) . "</li>";
echo "<li class='$active'>" . html::a(inlink('task', "userID={$user->id}&type=canceledBy"), sprintf($lang->user->canceledBy, $that)) . "</li>";
?>
</ul>
</nav>

6
module/user/view/testcase.html.php
View File

@@ -19,9 +19,9 @@
$that = zget($lang->user->thirdPerson, $user->gender);
$active = $type == 'case2Him' ? 'active' : '';
echo "<li class='$active'>" . html::a($this->createLink('user', 'testcase', "userID={$user->id}&fromModule=$fromModule&type=case2Him"), sprintf($lang->user->case2Him, $that)) . "</li>";
echo "<li class='$active'>" . html::a($this->createLink('user', 'testcase', "userID={$user->id}&type=case2Him"), sprintf($lang->user->case2Him, $that)) . "</li>";
$active = $type == 'caseByHim' ? 'active' : '';
echo "<li class='$active'>" . html::a($this->createLink('user', 'testcase', "userID={$user->id}&fromModule=$fromModule&type=caseByHim"), sprintf($lang->user->caseByHim, $that)) . "</li>";
echo "<li class='$active'>" . html::a($this->createLink('user', 'testcase', "userID={$user->id}&type=caseByHim"), sprintf($lang->user->caseByHim, $that)) . "</li>";
?>
</ul>
</nav>
@@ -29,7 +29,7 @@
<div class='main-table'>
<table class='table has-sort-head'>
<?php
$vars = "userID={$user->id}&fromModule=$fromModule&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
$vars = "userID={$user->id}&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID";
$this->app->loadLang('testtask');
?>
<thead>

4
module/user/view/testtask.html.php
View File

@@ -17,14 +17,14 @@
<ul class='nav nav-default'>
<?php
$that = zget($lang->user->thirdPerson, $user->gender);
echo "<li class='active'>" . html::a($this->createLink('user', 'testtask', "userID={$user->id}&fromModule=$fromModule"), sprintf($lang->user->testTask2Him, $that)) . "</li>";
echo "<li class='active'>" . html::a($this->createLink('user', 'testtask', "userID={$user->id}"), sprintf($lang->user->testTask2Him, $that)) . "</li>";
?>
</ul>
</nav>
<div class='main-table'>
<table class='table has-sort-head'>
<?php $vars = "userID={$user->id}&fromModule=$fromModule&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<?php $vars = "userID={$user->id}&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
<thead>
<tr>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>

5
module/user/view/todo.html.php
View File

@@ -14,7 +14,6 @@
<?php include "../../common/view/datepicker.html.php"; ?>
<?php include './featurebar.html.php';?>
<?php js::set('userID', $user->id);?>
<?php js::set('fromModule', $fromModule);?>
<?php js::set('type', $type);?>
<div id='mainContent'>
<nav id='contentNav'>
@@ -23,7 +22,7 @@
foreach($lang->todo->periods as $period => $label)
{
$active = $type == $period ? 'active' : '';
$vars = "userID={$user->id}&fromModule=$fromModule&date=$period";
$vars = "userID={$user->id}&date=$period";
if($period == 'before') $vars .= "&status=undone";
echo "<li id='$period' class='$active'>" . html::a(inlink('todo', $vars), $label) . '</li> ';
}
@@ -33,7 +32,7 @@
<form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' data-ride='table' id='todoform' class='main-table table-todo'>
<table class='table has-sort-head table-fixed'>
<?php $vars = "userID={$user->id}&fromModule=$fromModule&type=$type&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
<?php $vars = "userID={$user->id}&type=$type&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>