Skip to content

Commit bc396c0

Browse files
committed
Show date range in title
1 parent 8ef0c35 commit bc396c0

File tree

3 files changed

+8
-22
lines changed

3 files changed

+8
-22
lines changed

modules/util/dates.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func ListSundaysBetween(startStr, endStr string) ([]int64, error) {
2525

2626
// Iterate from start date to end date and find all Sundays
2727
for currentDate := startDate; currentDate.Before(endDate); currentDate = currentDate.AddDate(0, 0, 7) {
28-
sundays = append(sundays, currentDate.Unix())
28+
sundays = append(sundays, currentDate.UnixMilli())
2929
}
3030

3131
return sundays, nil

routers/web/repo/contributors.go

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import (
44
"net/http"
55
"time"
66

7-
activities_model "code.gitea.io/gitea/models/activities"
87
contributors_model "code.gitea.io/gitea/models/contributors"
9-
"code.gitea.io/gitea/models/unit"
108
"code.gitea.io/gitea/modules/base"
119
"code.gitea.io/gitea/modules/context"
1210
)
@@ -26,30 +24,18 @@ func Contributors(ctx *context.Context) {
2624
}
2725
ctx.PageData["contributionType"] = ctx.Data["ContributionType"]
2826

29-
timeUntil := time.Now()
30-
var timeFrom time.Time
31-
32-
timeFrom = timeUntil.Add(-time.Hour * 24)
33-
ctx.Data["DateFrom"] = timeFrom.UTC().Format(time.RFC3339)
34-
ctx.Data["DateUntil"] = timeUntil.UTC().Format(time.RFC3339)
3527
ctx.Data["ContributionTypeText"] = ctx.Tr("repo.contributors.contribution_type." + ctx.Data["ContributionType"].(string))
3628

37-
var err error
38-
if ctx.Data["Activity"], err = activities_model.GetActivityStats(ctx, ctx.Repo.Repository, timeFrom,
39-
ctx.Repo.CanRead(unit.TypeReleases),
40-
ctx.Repo.CanRead(unit.TypeIssues),
41-
ctx.Repo.CanRead(unit.TypePullRequests),
42-
ctx.Repo.CanRead(unit.TypeCode)); err != nil {
43-
ctx.ServerError("GetActivityStats", err)
44-
return
45-
}
46-
47-
4829
if contributor_stats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository); err != nil {
4930
ctx.ServerError("GetContributorStats", err)
5031
return
5132
} else{
5233
ctx.PageData["repoContributorsCommitStats"] = contributor_stats
34+
timeUntil := time.Now()
35+
timeFrom := time.UnixMilli(contributor_stats[""].Weeks[0].Week)
36+
37+
ctx.Data["DateFrom"] = timeFrom.UTC().Format(time.RFC3339)
38+
ctx.Data["DateUntil"] = timeUntil.UTC().Format(time.RFC3339)
5339
// contributor_stats[""].Weeks.(map[string]interface{})
5440
}
5541

web_src/js/components/RepoContributors.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ const sfc = {
110110
datasets: [
111111
{
112112
data: this.masterChartData[""].weeks.map((i) => {
113-
return { x: i.week * 1000, y: i[this.type] };
113+
return { x: i.week, y: i[this.type] };
114114
}),
115115
pointRadius: 0,
116116
pointHitRadius: 0,
@@ -149,7 +149,7 @@ const sfc = {
149149
datasets: [
150150
{
151151
data: data.map((i) => {
152-
return { x: i.week * 1000, y: i[this.type] };
152+
return { x: i.week, y: i[this.type] };
153153
}),
154154
pointRadius: 0,
155155
pointHitRadius: 0,

0 commit comments

Comments
 (0)