From 130a7f17c8306f482aff94a8a640c4de14bc0b31 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Sat, 1 Mar 2025 11:17:34 +0530 Subject: [PATCH] GWM : filter issue --- main.go | 7 ++++--- pb_data/logs.db | Bin 32026624 -> 32026624 bytes utils/card_calculation.go | 20 ++++++++++++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/main.go b/main.go index d1479c2..97b4e6e 100644 --- a/main.go +++ b/main.go @@ -599,7 +599,7 @@ func main() { keyToFilter := record.GetString("unset_key") valueToExclude := record.GetString("unset_value") if keyToFilter == "" || valueToExclude == "" { - fmt.Println("unset_key or unset_value is empty. Skipping processing.") + // fmt.Println("unset_key or unset_value is empty. Skipping processing.") } else { // Filter the data dynamically and update chartData chartData = filterDynamicChartData(chartData, keyToFilter, valueToExclude) @@ -651,6 +651,7 @@ func main() { "tab_order": record.GetString("tab_order"), "chart_type_json": record.Get("chart_type_json"), "card_full_length": record.Get("card_full_length"), + "chart_bar_color": record.Get("chart_bar_color"), } var cRes []utils.Observation @@ -1678,8 +1679,8 @@ func main() { }() // Start your custom HTTP server on port 8091 - log.Println("Starting custom HTTP server on :8091") - if err := http.ListenAndServe(":8091", nil); err != nil { + log.Println("Starting custom HTTP server on :9091") + if err := http.ListenAndServe(":9091", nil); err != nil { log.Fatal("Failed to start server: ", err) } } diff --git a/pb_data/logs.db b/pb_data/logs.db index 0692b2171f1ca0d5845ea0af57e5402830f6f451..f9f196b43f5a733011dfab86f6e50830e5c06b85 100644 GIT binary patch delta 9647 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 N$6RTqolTu&`hTGkn@a!y delta 8702 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 diff --git a/utils/card_calculation.go b/utils/card_calculation.go index 230c6e8..16f059b 100644 --- a/utils/card_calculation.go +++ b/utils/card_calculation.go @@ -46,16 +46,17 @@ func CardCalculation(data []Observation, req CardCalculationRequest) (map[string // Convert RecodeIndex to an integer index, err := strconv.Atoi(req.RecodeIndex) if err != nil || index < 0 || index >= len(data) { - return nil, errors.New("invalid record index") + // return nil, errors.New("invalid record index") + selectedData = []Observation{} + } else { + selectedData = []Observation{data[index]} } - // Select only the requested index record - selectedData = []Observation{data[index]} } else { // Determine the number of records to use if req.RecordCount == "all" { - if len(data) >= 0 { + if len(data) > 0 { selectedData = data } else { selectedData = []Observation{} @@ -68,7 +69,7 @@ func CardCalculation(data []Observation, req CardCalculationRequest) (map[string } } else if req.RecordCount == "second_pair" { if len(data) >= 3 { - selectedData = data[:2] + selectedData = data[1:3] } else { selectedData = []Observation{} } @@ -76,10 +77,13 @@ func CardCalculation(data []Observation, req CardCalculationRequest) (map[string n := len(data) // array leangth var err error n, err = strconv.Atoi(req.RecordCount) - if err != nil || n > len(data) { - return nil, errors.New("invalid record count") + if err != nil || n >= len(data) { + // return nil, errors.New("invalid record count"); + selectedData = []Observation{} + } else { + selectedData = data[:n] } - selectedData = data[:n] + } }