From 932ff77bd1f48afbbaf49ad732f6a2c67d540386 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Thu, 20 Feb 2025 11:43:50 +0530 Subject: [PATCH] Additional display value in card : GWM --- main.go | 2 +- pb_data/data.db | Bin 208896 -> 208896 bytes pb_data/logs.db | Bin 770048 -> 770048 bytes utils/card_calculation.go | 47 ++++++++++++++++++++++++++++++-------- 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/main.go b/main.go index d601b63..2ea6055 100644 --- a/main.go +++ b/main.go @@ -1899,7 +1899,7 @@ func sendStatusChangeEmail(app *pocketbase.PocketBase, record *models.Record, ne body = fmt.Sprintf(`

Dear %s,

We are pleased to inform you that your registration with FCSC has been approved. You can now log in using the credentials that you had created.

-

Please access your account using the following link: "Access Your Account.

+

Please access your account using the following link: Access Your Account.

If you have any questions, please feel free to contact us for further clarification.


Best regards,

diff --git a/pb_data/data.db b/pb_data/data.db index a750f8fe20beaa404fbc102e7bbd3bb20a4a7991..1d0bcddb51b1e9c685eb95666157c7c792f69a87 100644 GIT binary patch delta 385 zcmZp8z|#OkEsR^3*aSFZnK`OiW4Vs;Y!?h*e9OH3k1$grBU797^bMj+l1y!h(@%>s zh4C2~C>WSp85mia80r}tOy3~IBr-ignn`7Qx)_r#qg-N2N@huBeqLfud{Jt0eo;z% zc50=Pm4Z@QVoq`D^m#H&hST?mGs#b{5oI!(o+8de@Exx^ha(^76{6%Bu2mG;4E+ zigFkk7@6uCw20$W))Wg;Hr-c>$$YxJG?P3(#FwVVR>r1!hDHX{H%c)HZwGo)o^g7H zIFrQm=`u_fK-Zj?VKQds+sMGeKbL`jF8>?;Bm6fu3p(`jPoJyLBqGefz#yEOlaW`N bo0OkzSej8_mN|VRP@?^YKGXCY`pg;tZQ5q@ delta 324 zcmZp8z|#OkEsR^3*aSG&F>_S2uH!n+vt2NN@h$WAKf+9jjMEQ^F$FTUdQFcPWs+oS zwVz%k$`mGGXrW+WVP#@!Wn`phZeSKQT``u)Y`d5klP=@*EO91x&XmlwwA7;1ypriY zGE9<;M$`X^F-cBOm0=Q?-Y>(%K3!j&Nd%-)V|$ha(=kTISFXDz=A2%Bwn(zHh)rK8#U#nr6wM(j$}!zniphMsoHUa> z%uztyCVIx^<`73s7m#OCoW4Yw=@z5m^m-X4|Lx~xn2eeEjxw4B%m0RdBma%f zf)2g>)930liKq)RYcrseAW#pt47iJq;q_yAB LXPSOPpIHL{UV2+| diff --git a/pb_data/logs.db b/pb_data/logs.db index 598055a3a228469ebcd851558f23b74cbf61b5f8..7018cf0dc77b60ce480d62b52ae0ced474dc8ada 100644 GIT binary patch delta 12407 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 delta 12807 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 0 { + color = "#11AF22" + } else if convertedValue < 0 { + color = "#D83731" + } + } return map[string]string{ "value": convertedValue, "display_value": displayValue, + "calculation": req.Formula, + "font_color": color, }, nil } @@ -237,7 +258,7 @@ func applyConversion(value float64, conversion string, numberFormat string) stri } } -func extractRecordKeyValue(data []Observation, key string, formula string, targetValue float64) string { +func extractRecordKeyValue(data []Observation, key string, additionalkey string, formula string, targetValue float64) string { if len(data) == 0 { return "" } @@ -248,10 +269,18 @@ func extractRecordKeyValue(data []Observation, key string, formula string, targe value, err := obs.ObsValue.Value.Float64() if err == nil && value == targetValue { if val, exists := obs.ObsKey[key]; exists { - return val + fmt.Println("additionalkey:", additionalkey) + // Check if additionalkey exists in obs.ObsKey + if val2, exists2 := obs.ObsKey[additionalkey]; exists2 { + fmt.Println("val2:", val2) + return val + " - " + val2 + } else { + return val + } } } } + case "total", "average", "different": if val1, exists1 := data[0].ObsKey[key]; exists1 { if val2, exists2 := data[len(data)-1].ObsKey[key]; exists2 {