Skip to content

The Unified and Autonomous Development Platform

chore: Add activity count in user overview page

Robin Shenae7eaa119a28
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.html
index cb2167cbff..1a4b754719 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.html
@@ -18,10 +18,10 @@
</div>
<div class="activities p-5">
<div class="d-flex mb-4 align-items-center">
- <div class="font-size-h2 mr-4 mb-0"><wicket:t>Activities</wicket:t></div>
- <div class="date-range ml-auto">
+ <div class="date-range mr-4">
<input wicket:id="dateRange" class="form-control form-control-sm">
</div>
+ <div class="ml-auto mb-0"><wicket:t><span wicket:id="activityCount"></span> activities</wicket:t></div>
</div>
<div class="stats border rounded p-4">
<div class="daily-stats overflow-auto mb-5"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java
index 5982b0fce7..5bebc802df 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java
@@ -376,6 +376,8 @@ public abstract class UserOverviewPanel extends GenericPanel<User> {
dateRangePicker.setRequired(true);
add(dateRangePicker);
+ add(new Label("activityCount", accessibleActivities.size() + inaccessibleActivityCount));
+
activitiesView = new RepeatingView("activities");
accessibleActivities.stream().limit(PAGE_SIZE).forEach(it -> {
for (var row: newActivityRows(activitiesView, it)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java
index e216e15d1e..36ce50ce20 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java
@@ -3511,6 +3511,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("This user is currently authenticating via external system. Setting password will switch to use internal database",
"该用户当前通过外部系统进行身份验证。设置密码将切换到使用内部数据库");
m.put("My Email Addresses", "我的电子邮件地址");
+ m.put("<span wicket:id=\"activityCount\"></span> activities", "<span wicket:id=\"activityCount\"></span> 个活动");
// Manually added keys
m.put("Create Administrator Account", "创建管理员账户");