ProcessOneAxisCell: populate axis cell info after determining cell visibility

Author: eduard93

MDX2JSON/ResultSet.cls.xml

@@ -145,40 +145,9 @@ Returns array of Axes</Description>
 	set cell=$$$NewDynObj
 
 	set tNode = $G($$$DeepSeeAxisGLVN(CubeIndex,AxisKey,"axes",Node))
-	set tDimNo = $LG(tNode,9)
-	set tHierNo = $LG(tNode,10)
-	set tLevelNo = $LG(tNode,11)
 
 	set cell.caption = ##class(%DeepSee.UserPortal.Utils).%ResolveText($LG(tNode,5)) // text caption
 	set cell.vis = $LG(tNode,2) // visibility helper - does not help (apperently it shows if the cell is the lowest level)  
-	set cell.format = $LG(tNode,12) // format for numbers, eg: $## ###.##
-	set cell.total = $LG(tNode,8) //COUNT,AVG function
-	set cell.type = $LG(tNode,1) // mbr,cmbr,lit,exp
-	set cell.valueID = $LG(tNode,6) // id in mdx dimension for mbr, path for cmbr
-	set cell.title = $LG(tNode,23)
-	
-	try {
-		set cell.path = ##class(%DeepSee.Query.Engine).%GetSpecForAxisNode(CubeName, QueryKey, AxisNumber, Node) // MDX cell path
-	} catch ex {
-		set cell.path = "path too long"		
-	}
-	
-	set cell.headerStyle = $LG(tNode,19)
-	set cell.cellStyle = $LG(tNode,18)
-	
-	set info = $LG(tNode,18)
-	if info'="" { // extract aggregation information, leave the rest as css
-		set summaryposition = $f(info,"summary")
-		if summaryposition>0 {
-			set summaryvalue = $e(info,summaryposition+1,$f(info,";",summaryposition)-2)
-			set cell.summary = summaryvalue // aggregate function
-			set $e(info,summaryposition-7,summaryposition + $l(summaryvalue) + 1) = ""
-		}
-		set cell.style = info // css
-	}
-
-	do ##class(%DeepSee.Utils).%GetDimensionCaption(CubeName,tDimNo, tHierNo,tLevelNo, .tAxisCaption)
-	set cell.dimension = tAxisCaption // cube dimension
 
 	// now we process cell children, if any exist
 	if ($D($$$DeepSeeAxisGLVN(CubeIndex, AxisKey, "axes", Node, "ch")) = 10) {
@@ -205,6 +174,40 @@ Returns array of Axes</Description>
 	if (..IsCellNull(cell, AxisNumber, Node)=1) {
 		return cell.children
 	}
+	
+	try {
+		set cell.path = ##class(%DeepSee.Query.Engine).%GetSpecForAxisNode(CubeName, QueryKey, AxisNumber, Node) // MDX cell path
+	} catch ex {
+		set cell.path = "path too long"		
+	}
+	
+	set cell.format = $LG(tNode,12) // format for numbers, eg: $## ###.##
+	set cell.total = $LG(tNode,8) //COUNT,AVG function
+	set cell.type = $LG(tNode,1) // mbr,cmbr,lit,exp
+	set cell.valueID = $LG(tNode,6) // id in mdx dimension for mbr, path for cmbr
+	set cell.title = $LG(tNode,23)
+	
+	set cell.headerStyle = $LG(tNode,19)
+	set cell.cellStyle = $LG(tNode,18)
+	
+	set info = $LG(tNode,18)
+	if info'="" { // extract aggregation information, leave the rest as css
+		set summaryposition = $f(info,"summary")
+		if summaryposition>0 {
+			set summaryvalue = $e(info,summaryposition+1,$f(info,";",summaryposition)-2)
+			set cell.summary = summaryvalue // aggregate function
+			set $e(info,summaryposition-7,summaryposition + $l(summaryvalue) + 1) = ""
+		}
+		set cell.style = info // css
+	}
+	
+	set tDimNo = $LG(tNode,9)
+	set tHierNo = $LG(tNode,10)
+	set tLevelNo = $LG(tNode,11)
+
+	do ##class(%DeepSee.Utils).%GetDimensionCaption(CubeName,tDimNo, tHierNo,tLevelNo, .tAxisCaption)
+	set cell.dimension = tAxisCaption // cube dimension
+
 
 	set:$$$Debug cell.visible = '..IsCellNull(cell,AxisNumber,Node)
 	set:$$$Debug cell.node = Node

MDX2JSON/Tests.cls.xml

@@ -8,12 +8,12 @@ Classes with support methods for testing MDX2JSON</Description>
 
 <Parameter name="LastCommit">
 <Type>%String</Type>
-<Default>837054cda0fc869888ffd57dd9d7a0a558d9911c</Default>
+<Default>5ed87eb495d30907ef7c41be9d17c52309b97ce5</Default>
 </Parameter>
 
 <Parameter name="LastCommitTS">
 <Type>%TimeStamp</Type>
-<Default>2020-11-13 08:59:36.384</Default>
+<Default>2021-07-01 16:03:56</Default>
 </Parameter>
 
 <Method name="ProjectLength">

module.xml

@@ -2,7 +2,7 @@
 <Export generator="Cache" version="25">
 <Document name="MDX2JSON.ZPM"><Module>
  <Name>MDX2JSON</Name>
-  <Version>2.3.3</Version>
+  <Version>2.3.4</Version>
   <Description>RESTful web api for MDX to JSON transformation (plus JSONP and XML/A) for InterSystems Caché. Also provides information about DeepSee objects.</Description>
   <Packaging>module</Packaging>
   <SourcesRoot>./</SourcesRoot>