Added new events !!!

1 files changed, 19 insertions, 24 deletions

diff --git a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs
index bee94552e..b59ba8925 100644
--- a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs
@@ -381,6 +381,10 @@ Maybe you have deleted an entity that was no yet inserted into database?", LogCa
             return GetDbContextFromEntity(this);
         }
 
+        #endregion
+
+        #region Serialization
+
         public virtual EntitySerializationStrategy GetDefaultSerializationStrategy(EntitySerializationFlags flags)
         {
             EntitySerializationStrategy st = new EntitySerializationStrategy();
@@ -474,35 +478,26 @@ Maybe you have deleted an entity that was no yet inserted into database?", LogCa
             return ToJson(new EntitySerializationStrategy(), EntitySerializationFlags.IgnoreReferenceTypes | EntitySerializationFlags.Indented);
         }
 
-        public void PopulateFromJson(string json)
+        public void PopulateFromJson(string json, EntitySerializationStrategy serializationStrategy, EntitySerializationFlags flags)
         {
-            //JsonCobnve
-
-            //JObject from = JObject.Parse(json);
-            //JObject entity = new JObject(this);
-            //from.Merge()
-
-            //Person p = new Person()
-            //{
-            //    Age = 30,
-            //    Name = "Roy",
-            //};
+            var settings = new JsonSerializerSettings()
+            {
+                ContractResolver = new SerializableEntityContractResolver(serializationStrategy, flags),
+            };
 
-            //Person p2 = new Person();
-            //p2.Adderess = new Address()
-            //{
-            //    City = "Gan Yavne",
-            //    Street = "Yohanan"
-            //};
+            if (flags.HasFlag(EntitySerializationFlags.PreserveReferencesHandling))
+            {
+                settings.PreserveReferencesHandling = PreserveReferencesHandling.All;
+            }
 
-            //String j1 = JsonConvert.SerializeObject(p);
-            //String j2 = JsonConvert.SerializeObject(p2);
+            settings.Converters.Add(new StringEnumConverter { CamelCaseText = false });
 
-            //JsonConvert.PopulateObject(j2, p, new JsonSerializerSettings()
-            //{
-            //    NullValueHandling = NullValueHandling.Ignore,
+            JsonConvert.PopulateObject(json, this, settings);
+        }
 
-            //});
+        public void PopulateFromJson(string json)
+        {
+            PopulateFromJson(json, new EntitySerializationStrategy(), EntitySerializationFlags.PreserveReferencesHandling);
         }
 
         #endregion