From 2e117a88c560bb3f6be6151aaf8521e6b454b6c6 Mon Sep 17 00:00:00 2001
From: Khaja Nizamuddin <khajanizamuddin@hotmail.com>
Date: Wed, 10 May 2017 18:15:30 +0530
Subject: [PATCH] UX improvement 2

---
 .../Models/Chat/BaseContent.cs                |  2 ++
 ANAConversationStudio/Models/Chat/ChatNode.cs | 36 ++++++++++---------
 .../Properties/AssemblyInfo.cs                |  4 +--
 .../ViewModels/MainWindowViewModel.cs         |  6 ++--
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/ANAConversationStudio/Models/Chat/BaseContent.cs b/ANAConversationStudio/Models/Chat/BaseContent.cs
index 7b6c7e3..40519c7 100644
--- a/ANAConversationStudio/Models/Chat/BaseContent.cs
+++ b/ANAConversationStudio/Models/Chat/BaseContent.cs
@@ -112,6 +112,7 @@ public string SectionText
     public class TitleCaptionSectionContent : SectionContent
     {
         private string _Title;
+        [Category("Important")]
         public string Title
         {
             get { return _Title; }
@@ -126,6 +127,7 @@ public string Title
         }
 
         private string _Caption;
+        [Category("Important")]
         public string Caption
         {
             get { return _Caption; }
diff --git a/ANAConversationStudio/Models/Chat/ChatNode.cs b/ANAConversationStudio/Models/Chat/ChatNode.cs
index d59f23e..8a5554a 100644
--- a/ANAConversationStudio/Models/Chat/ChatNode.cs
+++ b/ANAConversationStudio/Models/Chat/ChatNode.cs
@@ -24,6 +24,7 @@ public ChatNode()
         #region Important
         private string _Name;
         [Category("Important")]
+        [PropertyOrder(1)]
         public string Name
         {
             get { return _Name; }
@@ -37,9 +38,26 @@ public string Name
             }
         }
 
+        private NodeTypeEnum _NodeType = NodeTypeEnum.Combination;
+        [Category("Important")]
+        [PropertyOrder(2)]
+        public NodeTypeEnum NodeType
+        {
+            get { return _NodeType; }
+            set
+            {
+                if (_NodeType != value)
+                {
+                    _NodeType = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         private ObservableCollection<Section> _Sections = new ObservableCollection<Section>();
         [NewItemTypes(typeof(TextSection), typeof(GifSection), typeof(ImageSection), typeof(GraphSection), typeof(AudioSection), typeof(VideoSection))]
         [Category("Important")]
+        [PropertyOrder(3)]
         [Editor(typeof(ChatNodeCollectionEditor<Section>), typeof(ChatNodeCollectionEditor<Section>))]
         public ObservableCollection<Section> Sections
         {
@@ -57,6 +75,7 @@ public ObservableCollection<Section> Sections
         private ObservableCollection<Button> _Buttons = new ObservableCollection<Button>();
         [Category("Important")]
         [Editor(typeof(ChatNodeCollectionEditor<Button>), typeof(ChatNodeCollectionEditor<Button>))]
+        [PropertyOrder(4)]
         public ObservableCollection<Button> Buttons
         {
             get { return _Buttons; }
@@ -70,20 +89,7 @@ public ObservableCollection<Button> Buttons
             }
         }
 
-        private NodeTypeEnum _NodeType = NodeTypeEnum.Combination;
-        [Category("Important")]
-        public NodeTypeEnum NodeType
-        {
-            get { return _NodeType; }
-            set
-            {
-                if (_NodeType != value)
-                {
-                    _NodeType = value;
-                    OnPropertyChanged();
-                }
-            }
-        }
+        
         #endregion
 
         #region Misc
@@ -167,8 +173,6 @@ public ObservableCollection<string> RequiredVariables
 
         private ApiMethodEnum? _ApiMethod;
         [Category("For NodeType ApiCall")]
-        //[JsonConverter(typeof(StringEnumConverter))]
-        //[BsonRepresentation(BsonType.String)]
         public ApiMethodEnum? ApiMethod
         {
             get { return _ApiMethod; }
diff --git a/ANAConversationStudio/Properties/AssemblyInfo.cs b/ANAConversationStudio/Properties/AssemblyInfo.cs
index 52266b1..83fffbb 100644
--- a/ANAConversationStudio/Properties/AssemblyInfo.cs
+++ b/ANAConversationStudio/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.11.0.0")]
-[assembly: AssemblyFileVersion("3.11.0.0")]
+[assembly: AssemblyVersion("3.12.0.0")]
+[assembly: AssemblyFileVersion("3.12.0.0")]
diff --git a/ANAConversationStudio/ViewModels/MainWindowViewModel.cs b/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
index eba60ce..aba4be0 100644
--- a/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
+++ b/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
@@ -561,10 +561,10 @@ public void LoadNodesFromDB()
 
                 var start = new Point(100, 60);
                 var allChatNodes = MongoHelper.Current.ChatNodes;
-                var unuqueChatNodes = allChatNodes.GroupBy(x => x.Id).SelectMany(x => x).OrderByDescending(x => x.IsStartNode).ToList();
+                var uniqueChatNodes = allChatNodes.GroupBy(x => x.Id).SelectMany(x => x).OrderByDescending(x => x.IsStartNode).ToList();
 
-                var nodeVMs = unuqueChatNodes.Select(x => new NodeViewModel(x, MongoHelper.Current.GetPointForNode(x.Id) ?? new Point(start.X, start.Y += 100))).ToList(); //Dont remove .ToList()
-                this.Network.Nodes.AddRange(nodeVMs); //Add all nodes before adding any connections
+                var nodeVMs = uniqueChatNodes.Select(x => new NodeViewModel(x, MongoHelper.Current.GetPointForNode(x.Id) ?? new Point(start.X, start.Y += 100))).ToList(); //Dont remove .ToList()
+                this.Network.Nodes.AddRange(nodeVMs); //Add all nodes before adding any connections  
 
                 foreach (var node in nodeVMs)
                 {