#2097 fix-1936

Merged
ychao_1983 merged 5 commits from fix-1936 into V20220519 1 year ago
  1. +2
    -0
      modules/setting/setting.go
  2. +13
    -2
      routers/api/v1/repo/repo_dashbord.go

+ 2
- 0
modules/setting/setting.go View File

@@ -584,6 +584,7 @@ var (
GrowthCommit float64
GrowthComments float64
RecordBeginTime string
GrowthBeginTime string
IgnoreMirrorRepo bool
}{}

@@ -1416,6 +1417,7 @@ func SetRadarMapConfig() {
RadarMap.GrowthCommit = sec.Key("growth_commit").MustFloat64(0.2)
RadarMap.GrowthComments = sec.Key("growth_comments").MustFloat64(0.2)
RadarMap.RecordBeginTime = sec.Key("record_beigin_time").MustString("2021-11-05")
RadarMap.GrowthBeginTime = sec.Key("growth_beigin_time").MustString("2022-05-20")
RadarMap.IgnoreMirrorRepo = sec.Key("ignore_mirror_repo").MustBool(true)

}


+ 13
- 2
routers/api/v1/repo/repo_dashbord.go View File

@@ -138,7 +138,7 @@ func GetProjectsSummaryData(ctx *context.Context) {

var datas = make([]*ProjectSummaryBaseData, 0)

recordBeginTime, err := getRecordBeginTime()
recordBeginTime, err := getGrowthRecordBeginTime()
if err != nil {
log.Error("Can not get record begin time", err)
ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
@@ -240,6 +240,8 @@ func getEndOfMonthDates(beginTime time.Time, endTime time.Time) []string {
}
}

dates = append(dates, endTime.AddDate(0, 0, -1).Format(DATE_FORMAT))

return dates
}

@@ -386,7 +388,7 @@ func ServeAllProjectsPeriodStatisticsFile(ctx *context.Context) {

func GetProjectsSummaryDataFile(ctx *context.Context) {

recordBeginTime, err := getRecordBeginTime()
recordBeginTime, err := getGrowthRecordBeginTime()
if err != nil {
log.Error("Can not get record begin time", err)
ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
@@ -573,6 +575,9 @@ func getFileName(ctx *context.Context, beginTime time.Time, endTime time.Time, p
}
if ctx.QueryTrim("type") == "all" {
baseName = baseName + ctx.Tr("repo.all")
} else if ctx.QueryTrim("type") == "last_month" {
baseName = baseName + beginTime.AddDate(0, 0, -1).Format(EXCEL_DATE_FORMAT) + "_" + endTime.AddDate(0, 0, -2).Format(EXCEL_DATE_FORMAT)

} else {
baseName = baseName + beginTime.AddDate(0, 0, -1).Format(EXCEL_DATE_FORMAT) + "_" + endTime.AddDate(0, 0, -1).Format(EXCEL_DATE_FORMAT)
}
@@ -587,6 +592,8 @@ func getSummaryFileName(ctx *context.Context, beginTime time.Time, endTime time.
baseName = baseName + ctx.Tr("repo.all")
} else if ctx.QueryTrim("type") == "current_year" {
baseName = baseName + ctx.Tr("repo.current_year")
} else if ctx.QueryTrim("type") == "last_month" {
baseName = baseName + beginTime.Format(EXCEL_DATE_FORMAT) + "_" + endTime.AddDate(0, 0, -2).Format(EXCEL_DATE_FORMAT)
} else {
baseName = baseName + beginTime.Format(EXCEL_DATE_FORMAT) + "_" + endTime.AddDate(0, 0, -1).Format(EXCEL_DATE_FORMAT)
}
@@ -950,6 +957,10 @@ func getRecordBeginTime() (time.Time, error) {
return time.ParseInLocation(DATE_FORMAT, setting.RadarMap.RecordBeginTime, time.Local)
}

func getGrowthRecordBeginTime() (time.Time, error) {
return time.ParseInLocation(DATE_FORMAT, setting.RadarMap.GrowthBeginTime, time.Local)
}

func getTotalPage(total int64, pageSize int) int {

another := 0


Loading…
Cancel
Save