Adds support for interaction components

TinCan/ActivityDefinition.cs

@@ -13,7 +13,16 @@ You may obtain a copy of the License at
     See the License for the specific language governing permissions and
     limitations under the License.
 */
+
+/*
+ *  Modified by Paul Carpenter 2015
+ *  
+ *  Includes support for Activity Interactions
+ *  
+ */
+
 using System;
+using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 using TinCan.Json;
 
@@ -26,13 +35,13 @@ public class ActivityDefinition : JsonModel
         public LanguageMap name { get; set; }
         public LanguageMap description { get; set; }
         public Extensions extensions { get; set; }
-        //public InteractionType interactionType { get; set; }
-        //public List<String> correctResponsesPattern { get; set; }
-        //public List<InteractionComponent> choices { get; set; }
-        //public List<InteractionComponent> scale { get; set; }
-        //public List<InteractionComponent> source { get; set; }
-        //public List<InteractionComponent> target { get; set; }
-        //public List<InteractionComponent> steps { get; set; }
+        public String interactionType { get; set; }
+        public List<String> correctResponsesPattern { get; set; }
+        public List<InteractionComponent> choices { get; set; }
+        public List<InteractionComponent> scale { get; set; }
+        public List<InteractionComponent> source { get; set; }
+        public List<InteractionComponent> target { get; set; }
+        public List<InteractionComponent> steps { get; set; }
 
         public ActivityDefinition() {}
 
@@ -60,6 +69,58 @@ public ActivityDefinition(JObject jobj)
             {
                 extensions = (Extensions)jobj.Value<JObject>("extensions");
             }
+            if (jobj["interactionType"] != null)
+            {
+                interactionType = jobj.Value<String>("interactionType");
+            }
+            if (jobj["correctResponsesPattern"] != null)
+            {
+                correctResponsesPattern = new List<String>();
+                foreach (JValue jcorrectResponsesPattern in jobj["correctResponsesPattern"])
+                {
+                    correctResponsesPattern.Add(jcorrectResponsesPattern.ToString());
+                }
+            }
+            if (jobj["choices"] != null)
+            {
+                choices = new List<InteractionComponent>();
+                foreach (JObject jchoices in jobj["choices"])
+                {
+                    choices.Add((InteractionComponent)jchoices);
+                }
+            }
+            if (jobj["scale"] != null)
+            {
+                scale = new List<InteractionComponent>();
+                foreach (JObject jscale in jobj["scale"])
+                {
+                    scale.Add((InteractionComponent)jscale);
+                }
+            }
+            if (jobj["source"] != null)
+            {
+                source = new List<InteractionComponent>();
+                foreach (JObject jsource in jobj["source"])
+                {
+                    source.Add((InteractionComponent)jsource);
+                }
+            }
+            if (jobj["target"] != null)
+            {
+                target = new List<InteractionComponent>();
+                foreach (JObject jtarget in jobj["target"])
+                {
+                    target.Add((InteractionComponent)jtarget);
+                }
+            }
+            if (jobj["steps"] != null)
+            {
+                steps = new List<InteractionComponent>();
+                foreach (JObject jsteps in jobj["steps"])
+                {
+                    steps.Add((InteractionComponent)jsteps);
+                }
+            }
         }
 
         public override JObject ToJObject(TCAPIVersion version) {
@@ -85,6 +146,70 @@ public override JObject ToJObject(TCAPIVersion version) {
             {
                 result.Add("extensions", extensions.ToJObject(version));
             }
+            if (interactionType != null)
+            {
+                result.Add("interactionType", interactionType.ToString());
+            }
+            if (correctResponsesPattern != null && correctResponsesPattern.Count > 0)
+            {
+                var jcorrectResponsesPattern = new JArray();
+                result.Add("correctResponsesPattern", jcorrectResponsesPattern);
+
+                foreach (String correctReponse in correctResponsesPattern)
+                {
+                    jcorrectResponsesPattern.Add(correctReponse.ToString());
+                }
+            }
+            if (choices != null && choices.Count > 0)
+            {
+                var jchoices = new JArray();
+                result.Add("choices", jchoices);
+
+                foreach (InteractionComponent c in choices)
+                {
+                    jchoices.Add(c.ToJObject(version));
+                }
+            }
+            if (scale != null && scale.Count > 0)
+            {
+                var jscale = new JArray();
+                result.Add("scale", jscale);
+
+                foreach (InteractionComponent s in scale)
+                {
+                    jscale.Add(s.ToJObject(version));
+                }
+            }
+            if (source != null && source.Count > 0)
+            {
+                var jsource = new JArray();
+                result.Add("source", jsource);
+
+                foreach (InteractionComponent s in source)
+                {
+                    jsource.Add(s.ToJObject(version));
+                }
+            }
+            if (target != null && target.Count > 0)
+            {
+                var jtarget = new JArray();
+                result.Add("target", jtarget);
+
+                foreach (InteractionComponent t in target)
+                {
+                    jtarget.Add(t.ToJObject(version));
+                }
+            }
+            if (steps != null && steps.Count > 0)
+            {
+                var jsteps = new JArray();
+                result.Add("steps", jsteps);
+
+                foreach (InteractionComponent s in steps)
+                {
+                    jsteps.Add(s.ToJObject(version));
+                }
+            }
 
             return result;
         }

TinCan/InteractionComponent.cs

@@ -0,0 +1,59 @@
+/*
+ *  Created by Paul Carpenter 2015
+ *  
+ *  Includes support for Activity Interaction Components
+ *  
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json.Linq;
+using TinCan.Json;
+
+namespace TinCan
+{
+    public class InteractionComponent : JsonModel
+    {
+        public String id { get; set; }
+        public LanguageMap description { get; set; }
+
+        public InteractionComponent() { }
+
+        public InteractionComponent(StringOfJSON json): this(json.toJObject()) {}
+
+        public InteractionComponent(JObject jobj)
+        {
+            if (jobj["id"] != null)
+            {
+                id = jobj.Value<String>("id");
+            }
+            if (jobj["description"] != null)
+            {
+                description = (LanguageMap)jobj.Value<JObject>("description");
+            }
+        }
+
+        public override JObject ToJObject(TCAPIVersion version)
+        {
+            JObject result = new JObject();
+
+            if (id != null)
+            {
+                result.Add("id", id);
+            }
+            if (description != null && !description.isEmpty())
+            {
+                result.Add("description", description.ToJObject(version));
+            }
+
+            return result;
+        }
+
+        public static explicit operator InteractionComponent(JObject jobj)
+        {
+            return new InteractionComponent(jobj);
+        }
+    }
+}

TinCan/TinCan.csproj

@@ -41,8 +41,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net35\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -60,6 +61,7 @@
     <Compile Include="ActivityDefinition.cs" />
     <Compile Include="Context.cs" />
     <Compile Include="ContextActivities.cs" />
+    <Compile Include="InteractionComponent.cs" />
     <Compile Include="StatementsQueryResultFormat.cs" />
     <Compile Include="StatementsQuery.cs" />
     <Compile Include="SubStatement.cs" />

TinCan/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net35" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net35" />
 </packages>