Skip to content

Commit 314e4d9

Browse files
committed
Return widget's dataProperties if available.
Required to draw scorecard widgets
1 parent 744520a commit 314e4d9

2 files changed

Lines changed: 42 additions & 4 deletions

File tree

MDX2JSON/Dashboard.cls.xml

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Converts relevant parts of %DeepSee.Dashboard.Widget object into %ZEN.proxyObjec
167167
if Widget.type = "portlet" {
168168
set portletClass = Widget.subtypeClass
169169
set:portletClass="" portletClass = Widget.subtype
170-
set obj.settings = ..PortletSettongsToArray(portletClass)
170+
set obj.settings = ..PortletSettingsToArray(portletClass)
171171
}
172172
173173
set obj.mdx = $g(mdx)
@@ -180,6 +180,7 @@ Converts relevant parts of %DeepSee.Dashboard.Widget object into %ZEN.proxyObjec
180180
set obj.cube = CubeName
181181
set obj.displayInfo = ..GetWidgetDisplayInfo(Widget)
182182
set obj.controls = $$$NewDynObjList
183+
set obj.dataProperties = $$$NewDynObjList
183184
184185
for i=1:1:Widget.controls.Count()
185186
{
@@ -188,6 +189,14 @@ Converts relevant parts of %DeepSee.Dashboard.Widget object into %ZEN.proxyObjec
188189
$$$Insert(obj.controls,control)
189190
}
190191
}
192+
193+
for i=1:1:Widget.dataProperties.Count()
194+
{
195+
set dataProperty = ..WidgetDataPropertyToProxyObject(Widget.dataProperties.GetAt(i))
196+
if $IsObject(dataProperty) {
197+
$$$Insert(obj.dataProperties,dataProperty)
198+
}
199+
}
191200
192201
if ##class(%Dictionary.CompiledMethod).%ExistsId("MDX2JSON.Dashboard||Process"_Widget.subtype) {
193202
do $ClassMethod("MDX2JSON.Dashboard", "Process"_Widget.subtype, Widget, obj)
@@ -206,6 +215,35 @@ Converts relevant parts of %DeepSee.Dashboard.Widget object into %ZEN.proxyObjec
206215
]]></Implementation>
207216
</Method>
208217

218+
<Method name="WidgetDataPropertyToProxyObject">
219+
<ClassMethod>1</ClassMethod>
220+
<FormalSpec>dataProperty:%DeepSee.Dashboard.DataProperty</FormalSpec>
221+
<Implementation><![CDATA[
222+
set obj = $$$NewDynObj
223+
set obj.align = dataProperty.align
224+
set obj.baseValue = dataProperty.baseValue
225+
set obj.dataValue = dataProperty.dataValue
226+
set obj.display = dataProperty.display
227+
set obj.format = dataProperty.format
228+
set obj.label = dataProperty.label
229+
set obj.name = dataProperty.name
230+
set obj.override = dataProperty.override
231+
set obj.rangeLower = dataProperty.rangeLower
232+
set obj.rangeUpper = dataProperty.rangeUpper
233+
set obj.showAs = dataProperty.showAs
234+
set obj.style = dataProperty.style
235+
set obj.subtype = dataProperty.subtype
236+
set obj.summary = dataProperty.summary
237+
set obj.summaryValue = dataProperty.summaryValue
238+
set obj.targetValue = dataProperty.targetValue
239+
set obj.thresholdLower = dataProperty.thresholdLower
240+
set obj.thresholdUpper = dataProperty.thresholdUpper
241+
set obj.valueColumn = dataProperty.valueColumn
242+
set obj.width = dataProperty.width
243+
quit obj
244+
]]></Implementation>
245+
</Method>
246+
209247
<Method name="ProcesscomboChart">
210248
<ClassMethod>1</ClassMethod>
211249
<FormalSpec>Widget:%DeepSee.Dashboard.Widget,Obj:%ZEN.proxyObject</FormalSpec>
@@ -463,7 +501,7 @@ Determines position of a widget in dashboard's widget list. </Description>
463501
]]></Implementation>
464502
</Method>
465503

466-
<Method name="PortletSettongsToArray">
504+
<Method name="PortletSettingsToArray">
467505
<Description><![CDATA[
468506
On return, <var>pInfo</var> can contain a list of settings in the form:<br/>
469507
pInfo(n) = $LB(name,value,type,caption,title)<br/>

MDX2JSON/Tests.cls.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Classes with support methods for testing MDX2JSON</Description>
88

99
<Parameter name="LastCommit">
1010
<Type>%String</Type>
11-
<Default>3037ee3022e6a49a2cc5003c5e0c8313732b6aef</Default>
11+
<Default>744520a21a4b0ba4599aa7d2faf5e6544c656501</Default>
1212
</Parameter>
1313

1414
<Parameter name="LastCommitTS">
1515
<Type>%TimeStamp</Type>
16-
<Default>2020-04-01 14:52:39.840</Default>
16+
<Default>2020-11-10 07:10:54.899</Default>
1717
</Parameter>
1818

1919
<Method name="ProjectLength">

0 commit comments

Comments
 (0)