GWM : code merge

main.go

@@ -300,7 +300,7 @@ func fetchfilterJSON(kpi string) ([]FilterGroup, error) {
 			log.Printf("Failed to parse exclusion filters JSON: %v", err)
 			return nil, err
 		}
-		log.Printf("Parsed Exclusion Filters: %+v", exclusionFilters)
+		// log.Printf("Parsed Exclusion Filters: %+v", exclusionFilters)
 	}
 
 	// Convert filters from []FilterGroup to []utils.FilterGroup manually
@@ -521,6 +521,10 @@ func main() {
 
 	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
 
+		e.Router.GET("/pw/auth/confirm-password-reset/:token", func(c echo.Context) error {
+			return c.File("pb_public/confirm_password_reset.html")
+		})
+
 		e.Router.GET("/api/login_success", func(c echo.Context) error {
 
 			userID := c.QueryParam("id")
@@ -856,6 +860,30 @@ func main() {
 						fmt.Println("Error decoding request data:", err)
 					}
 
+					if record.GetString("custom_calculation") == "true" {
+
+						customCalculationReq := record.Get("chart_custom_calculation_json")
+
+						var chartCustomCalculationRequest utils.ChartCalculationRequest
+
+						jsonData, err := json.Marshal(customCalculationReq)
+						if err != nil {
+							log.Println("Error marshaling to JSON:", err)
+						}
+
+						err = json.Unmarshal(jsonData, &chartCustomCalculationRequest)
+						if err != nil {
+							log.Println("Error unmarshalling JSON:", err)
+						}
+						customResult, err := utils.CalculateGroupedSum(cRes, chartCustomCalculationRequest)
+						if err != nil {
+							fmt.Println("Error:", err)
+						}
+
+						cRes = customResult
+
+					}
+
 					// Process each request and store results
 					for _, req := range requests {
 						result, err := utils.CardCalculation(cRes, req)

pb_data/storage/lwlx5jbczvvqidy/08uk8a7n2omayt0/kpi_icon_oil_export_ZcMNQFjKl3.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-OilExport.png"},"md5":"N0yA93/49HeIhAyNKrrPHA=="}

pb_data/storage/lwlx5jbczvvqidy/0t02dtbzw9nh0un/kpi_icon_natural_reserves_VVFBElcnvZ.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-NaturalReserves.png"},"md5":"EidU5zyMspc/3lI2BgLvkg=="}

pb_data/storage/lwlx5jbczvvqidy/0zh7rznegriyts9/kpi_icon_crops_area_S0HWXobmaa.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-CropsArea.png"},"md5":"6BWT6i/rBlR1hej7AA6Gkw=="}

pb_data/storage/lwlx5jbczvvqidy/0zh7rznegriyts9/thumbs_kpi_icon_crops_area_S0HWXobmaa.png/100x100_kpi_icon_crops_area_S0HWXobmaa.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"srBd6fWEm86XwUV6j55geA=="}

pb_data/storage/lwlx5jbczvvqidy/1v4uligg4a8ytyd/kpi_icon_health_centers_qARFNZlktb.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-HealthCenters.png"},"md5":"QUPb24ZJ+yVFx/cBFROKSQ=="}

pb_data/storage/lwlx5jbczvvqidy/1v4uligg4a8ytyd/thumbs_kpi_icon_health_centers_qARFNZlktb.png/100x100_kpi_icon_health_centers_qARFNZlktb.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"lv9iL3SiCG7IKY80k3aevQ=="}

pb_data/storage/lwlx5jbczvvqidy/2nmyrwtwygjajaj/kpi_icon_natural_reserves_blYNwKCEN3.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-NaturalReserves.png"},"md5":"EidU5zyMspc/3lI2BgLvkg=="}

pb_data/storage/lwlx5jbczvvqidy/2nmyrwtwygjajaj/thumbs_kpi_icon_natural_reserves_blYNwKCEN3.png/100x100_kpi_icon_natural_reserves_blYNwKCEN3.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"uiU2k7ZNxToo4t8GzxMZpg=="}

pb_data/storage/lwlx5jbczvvqidy/31yoxchyhqmxobg/kpi_icon_livestock_cattles_mKAdalLbu9.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-LivestockCattles.png"},"md5":"DUjKL1yZT8pt3ybZuqCXqA=="}

pb_data/storage/lwlx5jbczvvqidy/37260j3iuxvsw35/kpi_icon_water_production_pFn1kZz5hs.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-WaterProduction.png"},"md5":"JQKlwTvuva3eX3OWCoC4SQ=="}

pb_data/storage/lwlx5jbczvvqidy/3qbk5q1o91a7mxr/kpi_icon_population_tiZ1F9Am6S.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-Population.png"},"md5":"BPQklAKzE1awhyRzVAam6A=="}

pb_data/storage/lwlx5jbczvvqidy/3qbk5q1o91a7mxr/thumbs_kpi_icon_population_tiZ1F9Am6S.png/100x100_kpi_icon_population_tiZ1F9Am6S.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"r8v3ja0ZOKOy5aQ9I7h7CQ=="}

pb_data/storage/lwlx5jbczvvqidy/3x1uropxzobv52v/kpi_icon_livestock_sheep_06tyVHq3Dd.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-LivestockSheep.png"},"md5":"uvgfHXYusytaxXWP86/PMQ=="}

pb_data/storage/lwlx5jbczvvqidy/4epsb8882r8pqec/kpi_icon_higher_education_vOnb2X1UEh.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-HigherEducation.png"},"md5":"Y6aSamylpilRb2J432IlCw=="}

pb_data/storage/lwlx5jbczvvqidy/4epsb8882r8pqec/thumbs_kpi_icon_higher_education_vOnb2X1UEh.png/100x100_kpi_icon_higher_education_vOnb2X1UEh.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"tlHFCW9cJXf7GZV5RHEJcQ=="}

pb_data/storage/lwlx5jbczvvqidy/5kdzhwvz3tr635l/kpi_icon_natural_reserves_OLwJhmD4E3.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-NaturalReserves.png"},"md5":"EidU5zyMspc/3lI2BgLvkg=="}

pb_data/storage/lwlx5jbczvvqidy/5ue7d61xov3u2vq/kpi_icon_private_hospitals_ghvvZIKEPC.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-PrivateHospitals.png"},"md5":"5SjWoQfeOkCaWj01FDR9cw=="}

pb_data/storage/lwlx5jbczvvqidy/5ue7d61xov3u2vq/thumbs_kpi_icon_private_hospitals_ghvvZIKEPC.png/100x100_kpi_icon_private_hospitals_ghvvZIKEPC.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"bHwgt47x/pvelaidEC8jUQ=="}

pb_data/storage/lwlx5jbczvvqidy/605dy41iozsk9y7/kpi_icon_livestock_camels_SVR7pjcfqP.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-LivestockCamels.png"},"md5":"ZsXt5FAGlKkn7OqD2ACfPQ=="}

pb_data/storage/lwlx5jbczvvqidy/72wlhdjsz6r7uw1/kpi_icon_marriage_Gz63xIyNcf.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-Marriage.png"},"md5":"WcuuNyBpPkLP79pRToQqxw=="}

pb_data/storage/lwlx5jbczvvqidy/72wlhdjsz6r7uw1/thumbs_kpi_icon_marriage_Gz63xIyNcf.png/100x100_kpi_icon_marriage_Gz63xIyNcf.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"JKPiSHibvOosxzL9Yvx4GQ=="}

pb_data/storage/lwlx5jbczvvqidy/7qhyoxwg6i7v38q/kpi_icon_gov_centers_4AoNmKsZip.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-GovCenters.png"},"md5":"oI/Pws3Lr9JikiKltlQItg=="}

pb_data/storage/lwlx5jbczvvqidy/7qhyoxwg6i7v38q/thumbs_kpi_icon_gov_centers_4AoNmKsZip.png/100x100_kpi_icon_gov_centers_4AoNmKsZip.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"6Uk6rxjWRiCWyxUtTK4f1Q=="}

pb_data/storage/lwlx5jbczvvqidy/8ni5wxt3uekx1m5/kpi_icon_natural_reserves_xdXQrR1eGy.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-NaturalReserves.png"},"md5":"EidU5zyMspc/3lI2BgLvkg=="}

pb_data/storage/lwlx5jbczvvqidy/94sngusufwurz1z/kpi_icon_students_AXjZ8cCtgg.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-students.png"},"md5":"tFHswV4dhr6Nma4J3j206w=="}

pb_data/storage/lwlx5jbczvvqidy/94sngusufwurz1z/thumbs_kpi_icon_students_AXjZ8cCtgg.png/100x100_kpi_icon_students_AXjZ8cCtgg.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"wLgj6xpzUhcpwqZnkPUbKg=="}

pb_data/storage/lwlx5jbczvvqidy/98zc6gppkeaftkr/kpi_icon_crops_area_2w7huF3V7T.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-CropsArea.png"},"md5":"6BWT6i/rBlR1hej7AA6Gkw=="}

pb_data/storage/lwlx5jbczvvqidy/98zc6gppkeaftkr/thumbs_kpi_icon_crops_area_2w7huF3V7T.png/100x100_kpi_icon_crops_area_2w7huF3V7T.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"srBd6fWEm86XwUV6j55geA=="}

pb_data/storage/lwlx5jbczvvqidy/aam0hyue7qadse9/kpi_icon_consumption_av2Ed08z1f.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-Consumption.png"},"md5":"f1NUArqFL42VWuleVDQ+vQ=="}

pb_data/storage/lwlx5jbczvvqidy/b8n24r00hshx9jd/kpi_icon_natural_reserves_7Yq866BRPv.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-NaturalReserves.png"},"md5":"EidU5zyMspc/3lI2BgLvkg=="}

pb_data/storage/lwlx5jbczvvqidy/b8n24r00hshx9jd/thumbs_kpi_icon_natural_reserves_7Yq866BRPv.png/100x100_kpi_icon_natural_reserves_7Yq866BRPv.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"uiU2k7ZNxToo4t8GzxMZpg=="}

pb_data/storage/lwlx5jbczvvqidy/btw2vq3b5l5shkj/kpi_icon_livestock_sheep_I9OfSl2vKc.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-LivestockSheep.png"},"md5":"uvgfHXYusytaxXWP86/PMQ=="}

pb_data/storage/lwlx5jbczvvqidy/btw2vq3b5l5shkj/thumbs_kpi_icon_livestock_sheep_I9OfSl2vKc.png/100x100_kpi_icon_livestock_sheep_I9OfSl2vKc.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"07ogwztZgxRY87I+T3YS6w=="}

pb_data/storage/lwlx5jbczvvqidy/cot6oud4o90pug8/kpi_icon_oil_export_RhCkznDUvN.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-OilExport.png"},"md5":"N0yA93/49HeIhAyNKrrPHA=="}

pb_data/storage/lwlx5jbczvvqidy/cx0odwshl9gsu1a/kpi_icon_bed_private_UqWDwhuvzV.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-BedPrivate.png"},"md5":"dn3yPZ7kJcS4keAy2DNwnA=="}

pb_data/storage/lwlx5jbczvvqidy/cx0odwshl9gsu1a/thumbs_kpi_icon_bed_private_UqWDwhuvzV.png/100x100_kpi_icon_bed_private_UqWDwhuvzV.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"4+JA2k4qJ8X44ldYT5xyrA=="}

pb_data/storage/lwlx5jbczvvqidy/d2mxuh2glav14jl/kpi_icon_livestock_camels_xg6OFI0hpX.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-LivestockCamels.png"},"md5":"ZsXt5FAGlKkn7OqD2ACfPQ=="}

pb_data/storage/lwlx5jbczvvqidy/d2mxuh2glav14jl/thumbs_kpi_icon_livestock_camels_xg6OFI0hpX.png/100x100_kpi_icon_livestock_camels_xg6OFI0hpX.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"d+BsCUhtU7PtTiNIG3YEzg=="}

pb_data/storage/lwlx5jbczvvqidy/d96kvnpwyuki9ky/kpi_icon_livestock_cattles_mv8PbIDPT0.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-LivestockCattles.png"},"md5":"DUjKL1yZT8pt3ybZuqCXqA=="}

pb_data/storage/lwlx5jbczvvqidy/faokkiphyf3wkkr/kpi_icon_elecricity_ft926C2b66.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-Elecricity.png"},"md5":"g5SZ60AHnEGY0Rvlbnjfjw=="}

pb_data/storage/lwlx5jbczvvqidy/g47kh3w8yiukwow/kpi_icon_livestock_goats_YrTaYqtwwd.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-LivestockGoats.png"},"md5":"zVK8ySPjR3YA1nXAV1VHvw=="}

pb_data/storage/lwlx5jbczvvqidy/gq4lqwmrkc7qd93/kpi_icon_labor_force_4QZdphorxj.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-LaborForce.png"},"md5":"zOhby4VZ5jRoL1W0+9MYaw=="}

pb_data/storage/lwlx5jbczvvqidy/gq4lqwmrkc7qd93/thumbs_kpi_icon_labor_force_4QZdphorxj.png/100x100_kpi_icon_labor_force_4QZdphorxj.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"ft97NHJeY64GPOFwCY9FKg=="}

pb_data/storage/lwlx5jbczvvqidy/h18rsp3wepi7tml/kpi_icon_gov_centers_MLzK3nuhXD.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-GovCenters.png"},"md5":"oI/Pws3Lr9JikiKltlQItg=="}

pb_data/storage/lwlx5jbczvvqidy/h18rsp3wepi7tml/thumbs_kpi_icon_gov_centers_MLzK3nuhXD.png/100x100_kpi_icon_gov_centers_MLzK3nuhXD.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":null,"md5":"6Uk6rxjWRiCWyxUtTK4f1Q=="}

pb_data/storage/lwlx5jbczvvqidy/hqjk2045p3arj7u/kpi_icon_elecricity_6Hlh7798fT.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-Elecricity.png"},"md5":"g5SZ60AHnEGY0Rvlbnjfjw=="}

pb_data/storage/lwlx5jbczvvqidy/hx8ehw9my2isbcc/kpi_icon_consumption_WVKrWyTqtm.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-Consumption.png"},"md5":"f1NUArqFL42VWuleVDQ+vQ=="}

pb_data/storage/lwlx5jbczvvqidy/hz0z6mprf9iv0qg/kpi_icon_desalinated_water_production_QoYGRatrLO.png.attrs

@@ -0,0 +1 @@
+{"user.cache_control":"","user.content_disposition":"","user.content_encoding":"","user.content_language":"","user.content_type":"image/png","user.metadata":{"original-filename":"KPI-icon-DesalinatedWaterProduction.png"},"md5":"9Zkzl3VNS+Nu5WYSA1G9uQ=="}