From 32d8f958ed2ca072a74736d67a5350b92488b9a4 Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Tue, 18 Feb 2025 12:17:07 +0530
Subject: [PATCH] GWM

---
 pb_data/logs.db           | Bin 770048 -> 770048 bytes
 utils/card_calculation.go |  43 +++-----------------------------------
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/pb_data/logs.db b/pb_data/logs.db
index 8e05d54766d6fceae1ee9e44e49af14852a2d44b..8a5ed9eec4460d7d64fa41eb9939df944cd266c1 100644
GIT binary patch
delta 547
zcmZo@&~Iqa-@xL)*f5#Zp^=I8-{dxjIwm&Z$pVfclNB5}CZ{-FXFRsq#_15VmI$*p
zQ&w7PTCPQTNo8R{l6gfo*A9?iRYh@8Sz=mNPEl5oMT!a6_RSh@cQ~0Fc)m_%5BSK!
z^Bc(c5s<MtC2%4)4=XbV6W0zfxqUNZEVD4k>Vp5%6E-lhOcp3qoGf3+G1;*2GZW*N
z>5AfvqMNOYZZl5qDdbhPP%tpFGB5xlt{oE0#!N;AMy9$3M!JSb65A&ymPl+)C|RP-
zs5+T-fg=yo8P*V%yDVwU@0lwmI!bKLTA<9t=roxz+ivp11)+>PfTYxP0VhVQ&1H-G
zWY{bjcQG*T+RSla1LNdb8_F2BHya*mH$21$#7scU48$xz%nHP8K+L|~@DRu4UI8{{
zbp}3e?q!^l*cY%`GplbFR1jvCZV{Mj!KuyBsNGs`Yl|9k(?6QCh)w^nnK6{jQqRQ5
z++=!S6l2Te3p4IIgMDLSY-MbqXKH2`h3ZR$cuV3`bCBV=ZSl6YXfZH(;lyrs6Fnni
o19Q{qjHfu)Pgl6a_)s0$WK(nOCIiLW7ld;HG1vA5;oJ!s0O#(mQvd(}

delta 327
zcmZo@&~Iqa-@xL)ST~u~p>cADL)~Nn$B@Yijy#i79IrEe*lgo;h*^uLk0GQo(;&k#
zDXlUoy*SUTq>ytCP|!Zd)G*y5&$2wjti&|6xQui5W(~JHoXmB+jFZ^|K2H7<kTF>y
zkY#g9;6!d71_mYt&Pza2iu2-T##m-ykevnpCkqrRPL?m^nQU12nTbhlx}rFv=w|Dp
z+l(v>4BW3KGnR<3ssLFRL9EH{S9mAqmhfy&C|RP-s4|&#fg=xV2+LiTH0Jlr6--?d
z9VIqrEl_4+oH3a(yJ&L%4yDNt7f4MPaALIDT(-DRhQ)%(kYO{|fenn46%;C`&n#ke
zZZ0|0UUG;Lh?#(x8Hibcm=%cGfS7%I$svvjy*w=J3mEvgxtDQHVqdUXP+<al`+{&z
NAm-Y>Ae=iP0{}TsZ{`31

diff --git a/utils/card_calculation.go b/utils/card_calculation.go
index aa1835c..0b81612 100644
--- a/utils/card_calculation.go
+++ b/utils/card_calculation.go
@@ -18,6 +18,7 @@ type Observation struct {
 	} `json:"ObsValue"`
 }
 
+// ------------------------------------------------------------ card calculation---------------------------------------------------
 type CardCalculationRequest struct {
 	Formula      string `json:"formula"`
 	RecordCount  string `json:"record_count"`
@@ -150,34 +151,6 @@ func difference(data []Observation) float64 {
 	return ((latest - previous) / previous) * 100
 }
 
-// func applyConversion(value float64, conversion string, numberFormat string) string {
-
-// 	if numberFormat == "T" {
-// 		value *= 1000000000000
-// 	} else if numberFormat == "B" {
-// 		value *= 1000000000
-// 	} else if numberFormat == "M" {
-// 		value *= 1000000
-// 	} else if numberFormat == "K" {
-// 		value *= 1000
-// 	}
-
-// 	switch conversion {
-// 	case "T":
-// 		return fmt.Sprintf("%.2fT", value/1000000000000)
-// 	case "B":
-// 		return fmt.Sprintf("%.2fB", value/1000000000)
-// 	case "M":
-// 		return fmt.Sprintf("%.2fM", value/1000000)
-// 	case "K":
-// 		return fmt.Sprintf("%.2fK", value/1000)
-// 	case "%":
-// 		return fmt.Sprintf("%.2f%%", value)
-// 	default:
-// 		return fmt.Sprintf("%.2f", value)
-// 	}
-// }
-
 // Function to add commas to a number string
 func addCommas(num string) string {
 	n := len(num)
@@ -208,17 +181,9 @@ func applyConversion(value float64, conversion string, numberFormat string) stri
 		value *= 1000
 	}
 
-	// Helper function to format the number properly
-	// formatNumber := func(v float64, suffix string) string {
-	// 	if v == float64(int(v)) { // Check if v has no decimal part
-	// 		return fmt.Sprintf("%d%s", int(v), suffix)
-	// 	}
-	// 	return fmt.Sprintf("%.2f%s", v, suffix)
-	// }
-
 	// Helper function to format numbers with a thousands separator only in the default case
 	formatNumber := func(v float64, suffix string) string {
-		if suffix == "" { // Apply comma formatting only in default case
+		if suffix == "" || suffix == "K" {
 			if v == float64(int(v)) { // No decimal part
 				return addCommas(strconv.Itoa(int(v)))
 			}
@@ -272,9 +237,7 @@ func extractRecordKeyValue(data []Observation, key string, formula string, targe
 	return ""
 }
 
-//------------------------------------------------------------
-
-// ChartCalculationRequest struct for request parameters
+// ------------------------------------------------------------ chart calculation---------------------------------------------------
 type ChartCalculationRequest struct {
 	GroupByAndSum string `json:"groupby_and_sum"`
 	GetTop        string `json:"get_top"`