Consolidating open PRs

TinCan/ActivityDefinition.cs

@@ -14,9 +14,13 @@ You may obtain a copy of the License at
     limitations under the License.
 */
 using System;
+using System.Linq;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using TinCan.Json;
 
+
 namespace TinCan
 {
     public class ActivityDefinition : JsonModel
@@ -26,13 +30,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 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 ActivityDefinition() {}
 
@@ -60,6 +64,54 @@ public ActivityDefinition(JObject jobj)
             {
                 extensions = (Extensions)jobj.Value<JObject>("extensions");
             }
+            if (jobj["interactionType"] != null)
+            {
+                interactionType = InteractionType.FromValue(jobj.Value<String>("interactionType"));
+            }
+            if (jobj["correctResponsesPattern"] != null)
+            {
+                correctResponsesPattern = ((JArray)jobj["correctResponsesPattern"]).Select(x => x.Value<String>()).ToList<String>();
+            }
+            if (jobj["choices"] != null)
+            {
+                choices = new List<InteractionComponent>();
+                foreach (JObject jchoice in jobj["choices"])
+                {
+                    choices.Add(new InteractionComponent(jchoice));
+                }
+            }
+            if (jobj["scale"] != null)
+            {
+                scale = new List<InteractionComponent>();
+                foreach (JObject jscale in jobj["scale"])
+                {
+                    scale.Add(new InteractionComponent(jscale));
+                }
+            }
+            if (jobj["source"] != null)
+            {
+                source = new List<InteractionComponent>();
+                foreach (JObject jsource in jobj["source"])
+                {
+                    source.Add(new InteractionComponent(jsource));
+                }
+            }
+            if (jobj["target"] != null)
+            {
+                target = new List<InteractionComponent>();
+                foreach (JObject jtarget in jobj["target"])
+                {
+                    target.Add(new InteractionComponent(jtarget));
+                }
+            }
+            if (jobj["steps"] != null)
+            {
+                steps = new List<InteractionComponent>();
+                foreach (JObject jstep in jobj["steps"])
+                {
+                    steps.Add(new InteractionComponent(jstep));
+                }
+            }
         }
 
         public override JObject ToJObject(TCAPIVersion version) {
@@ -85,6 +137,64 @@ public override JObject ToJObject(TCAPIVersion version) {
             {
                 result.Add("extensions", extensions.ToJObject(version));
             }
+            if (interactionType != null)
+            {
+                result.Add("interactionType", interactionType.Value);
+            }
+            if (correctResponsesPattern != null && correctResponsesPattern.Count > 0)
+            {
+                result.Add("correctResponsesPattern", JToken.FromObject(correctResponsesPattern));
+            }
+            if (choices != null && choices.Count > 0)
+            {
+                var jchoices = new JArray();
+                result.Add("choices", jchoices);
+
+                foreach (InteractionComponent ichoice in choices)
+                {
+                    jchoices.Add(ichoice.ToJObject(version));
+                }
+            }
+            if (scale != null && scale.Count > 0)
+            {
+                var jscale = new JArray();
+                result.Add("scale", jscale);
+
+                foreach (InteractionComponent iscale in scale)
+                {
+                    jscale.Add(iscale.ToJObject(version));
+                }
+            }
+            if (source != null && source.Count > 0)
+            {
+                var jsource = new JArray();
+                result.Add("source", jsource);
+
+                foreach (InteractionComponent isource in source)
+                {
+                    jsource.Add(isource.ToJObject(version));
+                }
+            }
+            if (target != null && target.Count > 0)
+            {
+                var jtarget = new JArray();
+                result.Add("target", jtarget);
+
+                foreach (InteractionComponent itarget in target)
+                {
+                    jtarget.Add(itarget.ToJObject(version));
+                }
+            }
+            if (steps != null && steps.Count > 0)
+            {
+                var jsteps = new JArray();
+                result.Add("steps", jsteps);
+
+                foreach (InteractionComponent istep in steps)
+                {
+                    jsteps.Add(istep.ToJObject(version));
+                }
+            }
 
             return result;
         }

TinCan/InteractionComponent.cs

@@ -0,0 +1,68 @@
+/*
+    Copyright 2018 Rustici Software
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using TinCan.Json;
+
+namespace TinCan
+{
+    public class InteractionComponent : JsonModel
+    {
+        public String id;
+        public LanguageMap description { get; set; }
+
+        public InteractionComponent()
+        {
+
+        }
+
+        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/InteractionType.cs

@@ -0,0 +1,76 @@
+using System;
+
+namespace TinCan
+{
+    public sealed class InteractionType
+    {
+        private const string CHOICE = "choice";
+        private const string SEQUENCING = "sequencing";
+        private const string LIKERT = "likert";
+        private const string MATCHING = "matching";
+        private const string PERFORMANCE = "performance";
+        private const string TRUEFALSE = "true-false";
+        private const string FILLIN = "fill-in";
+        private const string LONGFILLIN = "long-fill-in";
+        private const string NUMERIC = "numeric";
+        private const string OTHER = "other";
+
+        public static readonly InteractionType Choice = new InteractionType(CHOICE);
+        public static readonly InteractionType Sequencing = new InteractionType(SEQUENCING);
+        public static readonly InteractionType Likert = new InteractionType(LIKERT);
+        public static readonly InteractionType Matching = new InteractionType(MATCHING);
+        public static readonly InteractionType Performance = new InteractionType(PERFORMANCE);
+        public static readonly InteractionType TrueFalse = new InteractionType(TRUEFALSE);
+        public static readonly InteractionType FillIn = new InteractionType(FILLIN);
+        public static readonly InteractionType LongFillIn = new InteractionType(LONGFILLIN);
+        public static readonly InteractionType Numeric = new InteractionType(NUMERIC);
+        public static readonly InteractionType Other = new InteractionType(OTHER);
+
+        private InteractionType(string value)
+        {
+            Value = value;
+        }
+
+        public static InteractionType FromValue(string value)
+        {
+            switch (value)
+            {
+                case CHOICE:
+                    return Choice;
+
+                case SEQUENCING:
+                    return Sequencing;
+
+                case LIKERT:
+                    return Likert;
+
+                case MATCHING:
+                    return Matching;
+
+                case PERFORMANCE:
+                    return Performance;
+
+                case TRUEFALSE:
+                    return TrueFalse;
+
+                case FILLIN:
+                    return FillIn;
+
+                case LONGFILLIN:
+                    return LongFillIn;
+
+                case NUMERIC:
+                    return Numeric;
+
+                case OTHER:
+                    return Other;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(value),
+                        $"'{value}' is not a valid interactionType.");
+            }
+        }
+
+        public string Value { get; private set; }
+    }
+}

TinCan/TCAPIVersion.cs

@@ -20,6 +20,7 @@ namespace TinCan
 {
     public sealed class TCAPIVersion
     {
+        public static readonly TCAPIVersion V103 = new TCAPIVersion("1.0.3");
         public static readonly TCAPIVersion V102 = new TCAPIVersion("1.0.2");
         public static readonly TCAPIVersion V101 = new TCAPIVersion("1.0.1");
         public static readonly TCAPIVersion V100 = new TCAPIVersion("1.0.0");
@@ -28,7 +29,7 @@ public sealed class TCAPIVersion
 
         public static TCAPIVersion latest()
         {
-            return V101;
+            return V103;
         }
 
         private static Dictionary<String, TCAPIVersion> known;
@@ -41,6 +42,7 @@ public static Dictionary<String, TCAPIVersion> GetKnown()
             }
 
             known = new Dictionary<String, TCAPIVersion>();
+            known.Add("1.0.3", V103);
             known.Add("1.0.2", V102);
             known.Add("1.0.1", V101);
             known.Add("1.0.0", V100);
@@ -57,6 +59,7 @@ public static Dictionary<String, TCAPIVersion> GetSupported()
             }
 
             supported = new Dictionary<String, TCAPIVersion>();
+            supported.Add("1.0.3", V103);
             supported.Add("1.0.2", V102);
             supported.Add("1.0.1", V101);
             supported.Add("1.0.0", V100);

TinCan/TinCan.csproj

@@ -94,6 +94,8 @@
     <Compile Include="ActivityDefinition.cs" />
     <Compile Include="Context.cs" />
     <Compile Include="ContextActivities.cs" />
+    <Compile Include="InteractionComponent.cs" />
+    <Compile Include="InteractionType.cs" />
     <Compile Include="StatementsQueryResultFormat.cs" />
     <Compile Include="StatementsQuery.cs" />
     <Compile Include="SubStatement.cs" />