No commit message

JulsMan · Jul 31, 2015 · f4cc4e4 · f4cc4e4
1 parent a695bbd
commit f4cc4e4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/GoogleChartsNGraphsControls/CHAPTimeline.cs b/GoogleChartsNGraphsControls/CHAPTimeline.cs
@@ -47,12 +47,14 @@ public class CHAPTimeline : BaseWebControl
                 ViewState["visibleChartRangeEnd"] = value;
             }
         }
-
         public void SetVisibleChartRange(DateTime start, DateTime end)
         {
             this.visibleChartRangeStart = start;
             this.visibleChartRangeEnd = end;
         }
+
+        public CHAPTimelineOptions TimelineOptions { get; set; }
+
         public void ChartData(CHAPTimelineEvent[] ListOfEvents)
         {
 
@@ -63,6 +65,8 @@ public void ChartData(CHAPTimelineEvent[] ListOfEvents)
                 dt.Columns.Add("start", typeof(DateTime));
                 dt.Columns.Add("end", typeof(DateTime));
                 dt.Columns.Add("content");
+                dt.Columns.Add("editable", typeof(bool));
+                dt.Columns.Add("group");
             }
 
 
@@ -109,21 +113,21 @@ protected override void RenderContents(HtmlTextWriter output)
 
         public override string ToString()
         {
-            List<Newtonsoft.Json.JsonConverter> myconverters = new List<Newtonsoft.Json.JsonConverter>();
-            myconverters.Add(new CustomConvertersColorToRGB());
-            myconverters.Add(new CustomConvertersAxis());
-            myconverters.Add(new CustomConvertersLegend());
-            myconverters.Add(new CustomConverterEnum());
-            myconverters.Add(new CustomConverterTrendLine());
-
-            Newtonsoft.Json.JsonSerializerSettings settings = new Newtonsoft.Json.JsonSerializerSettings()
-            {
-                NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,
-                Converters = myconverters
-            };
+            //List<Newtonsoft.Json.JsonConverter> myconverters = new List<Newtonsoft.Json.JsonConverter>();
+            //myconverters.Add(new CustomConvertersColorToRGB());
+            //myconverters.Add(new CustomConvertersAxis());
+            //myconverters.Add(new CustomConvertersLegend());
+            //myconverters.Add(new CustomConverterEnum());
+            //myconverters.Add(new CustomConverterTrendLine());
+
+            //Newtonsoft.Json.JsonSerializerSettings settings = new Newtonsoft.Json.JsonSerializerSettings()
+            //{
+            //    NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,
+            //    Converters = myconverters
+            //};
 
             string s = string.Empty;
-            s = Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.None, settings);
+            s = Newtonsoft.Json.JsonConvert.SerializeObject(this.TimelineOptions, Newtonsoft.Json.Formatting.None);
             return s;
         }
     }

diff --git a/GoogleChartsNGraphsControls/DataStructs.cs b/GoogleChartsNGraphsControls/DataStructs.cs
@@ -73,7 +73,8 @@ public CHAPTimelineEvent()
             this.start = DateTime.MinValue;
             this.end = DateTime.MinValue;
             this.content = string.Empty;
-            this.Editable = false;
+            this.editable = false;
+            this.group = string.Empty;
         }
         public CHAPTimelineEvent(DateTime start, string content): this()
         {

diff --git a/TestGoogleCharsNGraphsControls/CHAP.aspx.cs b/TestGoogleCharsNGraphsControls/CHAP.aspx.cs
@@ -31,7 +31,6 @@ private void ChapTimeline()
             lst.Add(new GoogleChartsNGraphsControls.CHAPTimelineEvent(new DateTime(2015, 7, 27), "Bed Time!"));
 
             this.CHAPTimeline1.ChartData(lst.ToArray());
-            this.CHAPTimeline1.GviOptionsOverride = "{}";
         }
     }
 }