-
-

icons['user']);?> my->profile;?>

-
- createLink('my', 'editprofile'), $lang->user->editProfile, '', "class='btn btn-primary'");?> +
+
+
+
+

user->legendBasic;?>

+
+ createLink('my', 'editprofile'), $lang->user->editProfile, '', "class='btn btn-primary'");?> +
+
+
+
+
+
user->account;?>
+
account;?>
+
user->realname;?>
+
realname;?>
+
user->dept;?>
+
+ $dept) + { + if($dept->name) echo $dept->name; + if(isset($deptPath[$key + 1])) echo $lang->arrow; + } + } + ?> +
+
user->role;?>
+
user->roleList[$user->role];?>
+
group->priv;?>
+
name . ' '; ?>
+
user->join;?>
+
join);?>
+
user->visits;?>
+
visits;?>
+
user->ip;?>
+
ip;?>
+
user->last;?>
+
last;?>
+ ranzhi):?> +
user->ranzhi;?>
+
+ ranzhi . ' ';?> + createLink('my', 'unbind'), "", 'hiddenwin', "class='bin-icon' title='{$lang->user->unbind}'");?> +
+ +
+
+
+
+
user->commiter;?>
+
commiter;?>
+
user->email;?>
+
email;?>
+ user->contactField) as $field):?> +
user->$field;?>
+
+ $field) + { + echo html::a("callto://$user->skype", $user->skype); + } + elseif($field == 'qq' and $user->$field) + { + echo html::a("tencent://message/?uin=$user->qq", $user->qq); + } + else + { + echo $user->$field; + } + ?> +
+ +
user->address;?>
+
address;?>
+
user->zipcode;?>
+
zipcode;?>
+
+
+
+
+
+
+
+
+

user->legendContribution;?>

+
+
+ user->personalData as $key => $title):?> +
+
+
+
+ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - user->contactField) as $field):?> - - - - - - - - - - - - - - ranzhi):?> - - - - - -
user->dept;?> - $dept) - { - if($dept->name) echo $dept->name; - if(isset($deptPath[$key + 1])) echo $lang->arrow; - } - } - ?> -
user->account;?>account;?>
user->realname;?>realname;?>
user->role;?>user->roleList[$user->role];?>
group->priv;?>name . ' '; ?>
user->commiter;?>commiter;?>
user->email;?>email;?>
user->join;?>join);?>
user->visits;?>visits;?>
user->ip;?>ip;?>
user->last;?>last;?>
user->$field;?> - $field) - { - echo html::a("callto://$user->skype", $user->skype); - } - elseif($field == 'qq' and $user->$field) - { - echo html::a("tencent://message/?uin=$user->qq", $user->qq); - } - else - { - echo $user->$field; - } - ?> -
user->address;?>address;?>
user->zipcode;?>zipcode;?>
user->ranzhi;?> - ranzhi . ' ';?> - createLink('my', 'unbind'), "", 'hiddenwin', "class='bin-icon' title='{$lang->user->unbind}'");?> -
diff --git a/module/user/lang/en.php b/module/user/lang/en.php index e5b1b6326b..7dd86496ab 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -48,6 +48,9 @@ $lang->user->originalPassword = 'Password'; $lang->user->verifyPassword = 'Password'; $lang->user->resetPassword = 'Forgot Password?'; +$lang->user->legendBasic = '基本资料'; +$lang->user->legendContribution = '个人贡献'; + $lang->user->index = "Home"; $lang->user->view = "Overview"; $lang->user->create = "Add User"; @@ -126,6 +129,15 @@ $lang->user->passwordStrengthList[0] = "Weak"; $lang->user->passwordStrengthList[1] = "Good"; $lang->user->passwordStrengthList[2] = "Strong"; +$lang->user->statusList['active'] = '正常'; +$lang->user->statusList['delete'] = '删除'; + +$lang->user->personalData['createdTodo'] = '创建的待办数'; +$lang->user->personalData['createdStory'] = '创建的需求数'; +$lang->user->personalData['finishedTask'] = '完成的任务数'; +$lang->user->personalData['resolvedBug'] = '解决的Bug数'; +$lang->user->personalData['createdCase'] = '创建的用例数'; + $lang->user->statusList['active'] = 'Activated'; $lang->user->statusList['delete'] = 'Deleted'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index c28d053067..e2cfc8c6c0 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -48,6 +48,9 @@ $lang->user->originalPassword = '原密码'; $lang->user->verifyPassword = '您的系统登录密码'; $lang->user->resetPassword = '忘记密码'; +$lang->user->legendBasic = '基本资料'; +$lang->user->legendContribution = '个人贡献'; + $lang->user->index = "用户视图首页"; $lang->user->view = "用户详情"; $lang->user->create = "添加用户"; @@ -129,6 +132,12 @@ $lang->user->passwordStrengthList[2] = "强"; $lang->user->statusList['active'] = '正常'; $lang->user->statusList['delete'] = '删除'; +$lang->user->personalData['createdTodo'] = '创建的待办数'; +$lang->user->personalData['createdStory'] = '创建的需求数'; +$lang->user->personalData['finishedTask'] = '完成的任务数'; +$lang->user->personalData['resolvedBug'] = '解决的Bug数'; +$lang->user->personalData['createdCase'] = '创建的用例数'; + $lang->user->keepLogin['on'] = '保持登录'; $lang->user->loginWithDemoUser = '使用demo帐号登录：'; diff --git a/module/user/model.php b/module/user/model.php index cfb85d98b7..674e12713a 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1550,4 +1550,25 @@ class userModel extends model ->orderBy('id') ->fetchAll(); } + + /** + * Get personal data. + * + * @param string $account + * @access public + * @return array + */ + public function getPersonalData($account = '') + { + if(empty($account)) $account = $this->app->user->account; + + $personalData = array(); + $personalData['createdTodo'] = $this->dao->select('count(*) as count')->from(TABLE_TODO)->where('account')->eq($account)->fetch('count'); + $personalData['createdStory'] = $this->dao->select('count(*) as count')->from(TABLE_STORY)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count'); + $personalData['finishedTask'] = $this->dao->select('count(*) as count')->from(TABLE_TASK)->where('finishedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count'); + $personalData['resolvedBug'] = $this->dao->select('count(*) as count')->from(TABLE_BUG)->where('resolvedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count'); + $personalData['createdCase'] = $this->dao->select('count(*) as count')->from(TABLE_CASE)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count'); + + return $personalData; + } }