Merge pull request #185 from PxTools/feature/json-stat2-alt-text

Added alternative text to json-stat2

Author: likp

PCAxis.Serializers/JsonStat2/Model/JsonStat2Dataset.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
+using System.Collections.Generic;
 
 using PxWeb.Api2.Server.Models;
 
@@ -299,6 +297,21 @@ public static void AddRefPeriod(DimensionValue dimensionValue, string valueCode,
             dimensionValue.Extension.Refperiod.Add(valueCode, refPeriod);
         }
 
+        public static void AddAlternativeText(DimensionValue dimensionValue, string valueCode, string altText)
+        {
+            if (altText == null) return;
+
+            if (dimensionValue.Extension is null)
+            {
+                dimensionValue.Extension = new ExtensionDimension();
+            }
+
+            if (dimensionValue.Extension.AlternativeText == null)
+                dimensionValue.Extension.AlternativeText = new Dictionary<string, string>();
+
+            dimensionValue.Extension.AlternativeText.Add(valueCode, altText);
+        }
+
         public static void AddDimensionLink(DimensionValue dimensionValue, Dictionary<string, string> metaIds)
         {
             dimensionValue.Link = new JsonstatExtensionLink

PCAxis.Serializers/JsonStat2Serializer.cs

@@ -97,6 +97,9 @@ public string BuildJsonStructure(PXModel model)
                         //refPeriod extension dimension
                         JsonStat2Dataset.AddRefPeriod(dimensionValue, variableValue.Code, variableValue.ContentInfo.RefPeriod);
 
+                        //alternativeText extension dimension
+                        JsonStat2Dataset.AddAlternativeText(dimensionValue, variableValue.Code, variableValue.ContentInfo.AlternativeText);
+
                         //measuringType extension dimension
                         JsonStat2Dataset.AddMeasuringType(dimensionValue, variableValue.Code, GetMeasuringType(variableValue.ContentInfo.StockFa));
 
@@ -241,6 +244,9 @@ private void AddInfoForEliminatedContentVariable(PXModel model, JsonStat2Dataset
             //refPeriod extension dimension
             JsonStat2Dataset.AddRefPeriod(dimensionValue, eliminatedValue, model.Meta.ContentInfo.RefPeriod);
 
+            //alternativeText extension dimension
+            JsonStat2Dataset.AddAlternativeText(dimensionValue, eliminatedValue, model.Meta.ContentInfo.AlternativeText);
+
             //measuringType extension dimension
             JsonStat2Dataset.AddMeasuringType(dimensionValue, eliminatedValue, GetMeasuringType(model.Meta.ContentInfo.StockFa));
 

PCAxis.Serializers/PCAxis.Serializers.csproj

@@ -28,7 +28,7 @@
 
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="Parquet.Net" Version="4.25.0" />
-    <PackageReference Include="PCAxis.Core" Version="1.2.7" />
+    <PackageReference Include="PCAxis.Core" Version="1.3.0" />
     <PackageReference Include="PCAxis.Metadata" Version="1.0.5" />
     <PackageReference Include="PCAxis.Query" Version="1.0.10" />
     <PackageReference Include="ClosedXML" Version="0.97.0" />
@@ -38,7 +38,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="PxWeb.Api2.Server.Models" Version="2.0.0" />
+    <PackageReference Include="PxWeb.Api2.Server.Models" Version="2.2.0" />
 
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />