GWM : shorting issue
This commit is contained in:
parent
dd5cad86b8
commit
d8b403302d
@ -433,7 +433,7 @@ type ChartCalculationRequest struct {
|
||||
GroupByAndSum string `json:"groupby_and_sum"`
|
||||
AdditionalForGroupByAndSum string `json:"additional_for_groupby_and_sum"`
|
||||
GetTop string `json:"get_top"`
|
||||
ShortBy string `json:"short_by"`
|
||||
SortBy string `json:"sort_by"`
|
||||
Conversion string `json:"conversion"`
|
||||
}
|
||||
|
||||
@ -465,12 +465,12 @@ func CalculateGroupedSum(observations []Observation, request ChartCalculationReq
|
||||
}
|
||||
|
||||
// Sort by value in descending order or given key
|
||||
shortByKey := request.ShortBy
|
||||
if shortByKey != "" {
|
||||
sortByKey := request.SortBy
|
||||
if sortByKey != "" {
|
||||
// Sort by given key
|
||||
sort.Slice(valueList, func(i, j int) bool {
|
||||
val1Str := valueList[i].ObsKey[shortByKey]
|
||||
val2Str := valueList[j].ObsKey[shortByKey]
|
||||
val1Str := valueList[i].ObsKey[sortByKey]
|
||||
val2Str := valueList[j].ObsKey[sortByKey]
|
||||
|
||||
val1, _ := strconv.ParseFloat(val1Str, 64)
|
||||
val2, _ := strconv.ParseFloat(val2Str, 64)
|
||||
@ -543,12 +543,12 @@ func CalculateGroupedSum(observations []Observation, request ChartCalculationReq
|
||||
}
|
||||
|
||||
// Sort by value in descending order or given key
|
||||
shortByKey := request.ShortBy
|
||||
if shortByKey != "" {
|
||||
sortByKey := request.SortBy
|
||||
if sortByKey != "" {
|
||||
// Sort by given key
|
||||
sort.Slice(result, func(i, j int) bool {
|
||||
val1Str := result[i].ObsKey[shortByKey]
|
||||
val2Str := result[j].ObsKey[shortByKey]
|
||||
val1Str := result[i].ObsKey[sortByKey]
|
||||
val2Str := result[j].ObsKey[sortByKey]
|
||||
|
||||
val1, _ := strconv.ParseFloat(val1Str, 64)
|
||||
val2, _ := strconv.ParseFloat(val2Str, 64)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user