Merge pull request #5 from Frisle/master

jakcpto · web-flow · commit 50d406e84e3b · 2023-01-27T11:52:38.000+04:00
FIX: Demointeroperability.kpi filters dropdown menu
diff --git a/MDX2JSON/Utils.cls b/MDX2JSON/Utils.cls
@@ -184,14 +184,16 @@ ClassMethod WriteFiltersForDataSource(pDataSource As %String, pValues As %Boolea
 		while (key '= "") {
 			set st = ##class(%DeepSee.Dashboard.Utils).%GetMembersForFilter(pDataSource,$lg(tFilters(key),2),.tMembers,.tDefaultFilterValue,pSearchKey,.pRelatedFilters,0,,.tValueList)
 			return:$$$ISERR(st) st
+			if +$g(tMembers) set tMembers = $g(tFilters(key)) // check if list contain simple number and replace it with proper query
 			merge tFilters(key) = tMembers // merge filter values
 			set key = $order(tFilters(key))
 	   	}
 	}
    	
-   	set st = ##class(%ZEN.Auxiliary.jsonProvider).%ArrayToJSON($lb("name","path","info"),.tFilters)
 
-	return st
+   	Set tAET = ##class(%ZEN.Auxiliary.altJSONProvider).%ArrayToAET($lb("name", "path", "info"), .tFilters)
+	do tAET.%ToJSON()
+	return tAET
 }
 
 /// Get information about pivot. <br>

Original file line number	Diff line number	Diff line change
`@@ -184,14 +184,16 @@ ClassMethod WriteFiltersForDataSource(pDataSource As %String, pValues As %Boolea`
`184`	`184`	`while (key '= "") {`
`185`	`185`	`set st = ##class(%DeepSee.Dashboard.Utils).%GetMembersForFilter(pDataSource,$lg(tFilters(key),2),.tMembers,.tDefaultFilterValue,pSearchKey,.pRelatedFilters,0,,.tValueList)`
`186`	`186`	`return:$$$ISERR(st) st`
	`187`	`+ if +$g(tMembers) set tMembers = $g(tFilters(key)) // check if list contain simple number and replace it with proper query`
`187`	`188`	`merge tFilters(key) = tMembers // merge filter values`
`188`	`189`	`set key = $order(tFilters(key))`
`189`	`190`	`}`
`190`	`191`	`}`
`191`	`192`
`192`		`- set st = ##class(%ZEN.Auxiliary.jsonProvider).%ArrayToJSON($lb("name","path","info"),.tFilters)`
`193`	`193`
`194`		`- return st`
	`194`	`+ Set tAET = ##class(%ZEN.Auxiliary.altJSONProvider).%ArrayToAET($lb("name", "path", "info"), .tFilters)`
	`195`	`+ do tAET.%ToJSON()`
	`196`	`+ return tAET`
`195`	`197`	`}`
`196`	`198`
`197`	`199`	`/// Get information about pivot. <br>`