merge

8 files changed, 22 insertions, 170 deletions

diff --git a/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs b/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs
deleted file mode 100644
index c02094273..000000000
--- a/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.CodeGeneration
-{
-    public class DbPropertyExtensionModel
-    {
-        public String Description { get; set; }
-        public double Min { get; set; }
-        public double Max { get; set; }
-        public String StringFormat { get; set; }
-        public int? Index { get; set; }
-
-        public bool HasDescription
-        {
-            get { return Description != null; }
-        }
-
-        public bool HasRange
-        {
-            get { return Min != Max; }
-        }
-
-        public bool HasStringFormat
-        {
-            get { return StringFormat != null; }
-        }
-
-        public bool HasIndex
-        {
-            get { return Index != null; }
-        }
-
-        public DbPropertyExtensionModel()
-        {
-            StringFormat = "0.0";
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs
index 8126c8bc4..24d61bb0a 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs
+++ b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs
@@ -66,7 +66,7 @@ namespace Tango.CodeGeneration
 
         public String DbDescription { get; set; }
 
-        public DbPropertyExtensionModel PropertyExtension { get; set; }
+        public RangeDescriptionModel RangeDescription { get; set; }
 
         public bool IsForeignKey { get; set; }
 
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs b/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs
new file mode 100644
index 000000000..4600460b7
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.CodeGeneration
+{
+    public class RangeDescriptionModel
+    {
+        public String Description { get; set; }
+        public double Min { get; set; }
+        public double Max { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
index 41413f4bd..6bff5b42e 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
@@ -77,7 +77,7 @@
     <Compile Include="ProtoEnumFile.cs" />
     <Compile Include="ProtoMessageFile.cs" />
     <Compile Include="ProtoProperty.cs" />
-    <Compile Include="DbPropertyExtensionModel.cs" />
+    <Compile Include="RangeDescriptionModel.cs" />
     <Compile Include="TangoDAOJavaFile.cs" />
     <Compile Include="EnumerationFileJava.cs" />
     <Compile Include="EnumerationFile.cs" />
@@ -90,7 +90,6 @@
     <Compile Include="ObservablesAdapterFile.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Property.cs" />
-    <Compile Include="TangoWebClientv2CodeFile.cs" />
     <Compile Include="TangoWebClientCodeFile.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -126,7 +125,6 @@
     <EmbeddedResource Include="Templates\TangoWebClientCodeFile.cshtml" />
     <EmbeddedResource Include="Templates\EntityDTOCodeFile.cshtml" />
     <EmbeddedResource Include="Templates\EntityInheritedDTOCodeFile.cshtml" />
-    <EmbeddedResource Include="Templates\TangoWebClientv2CodeFile.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/TangoWebClientv2CodeFile.cs b/Software/Visual_Studio/Tango.CodeGeneration/TangoWebClientv2CodeFile.cs
deleted file mode 100644
index 421655d07..000000000
--- a/Software/Visual_Studio/Tango.CodeGeneration/TangoWebClientv2CodeFile.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.CodeGeneration
-{
-    public class TangoWebClientv2CodeFile : Class
-    {
-        public class ControllerAction
-        {
-            public String Name { get; set; }
-            public String Request { get; set; }
-            public String Response { get; set; }
-        }
-
-        public String Namespace { get; set; }
-        public String ControllerName { get; set; }
-        public String LoginRequest { get; set; }
-        public String LoginResponse { get; set; }
-
-        public List<ControllerAction> Actions { get; set; }
-
-        public TangoWebClientv2CodeFile()
-        {
-            Actions = new List<ControllerAction>();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
index 76c035df9..950e24f79 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
@@ -19,7 +19,6 @@ using System.Linq;
 using Tango.DAL.Remote.DB;
 using Tango.Core;
 using System.ComponentModel;
-using Tango.Core.CustomAttributes;
 
 namespace Tango.BL.Entities
 {
@@ -68,32 +67,12 @@ namespace Tango.BL.Entities
         @(prop.IsForeignKey ? "[ForeignKey(\"" + prop.ForeignKeyName + "\")]" : "")
         @(prop.XmlIgnore ? "[XmlIgnore]" : "")
         @(prop.XmlIgnore ? "[JsonIgnore]" : "")
-        @if (prop.PropertyExtension != null)
+        @if (prop.RangeDescription != null)
         {
-            if (prop.PropertyExtension.HasDescription)
-            {
-                <div>
-                    [Description("@(prop.PropertyExtension.Description)")]
-                </div>
-            }
-            if (prop.PropertyExtension.HasRange)
-            {
-                <div>
-                    [Range(@(prop.PropertyExtension.Min),@(prop.PropertyExtension.Max))]
-                </div>
-            }
-            if (prop.PropertyExtension.HasStringFormat)
-            {
-                <div>
-                    [StringFormat("@(prop.PropertyExtension.StringFormat)")]
-                </div>
-            }
-            if (prop.PropertyExtension.HasIndex)
-            {
-                <div>
-                    [PropertyIndex(@(prop.PropertyExtension.Index))]
-                </div>
-            }
+        <div>
+        [Description("@(prop.RangeDescription.Description)")]
+        [Range(@(prop.RangeDescription.Min),@(prop.RangeDescription.Max))]
+        </div>
         }
         public @(prop.Construct || prop.Complex ? "virtual" : "") @(prop.Type) @(prop.Name)
         {
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientCodeFile.cshtml
index 3918ce928..7d9ebc075 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientCodeFile.cshtml
@@ -42,15 +42,6 @@ namespace @(model.Namespace)
 
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="@(model.Name)"/> class.
-        /// </summary>
-        /// <param name="cloned">Other instance.</param>
-        public @(model.Name)(@(model.Name) cloned) : base(cloned)
-        {
-
-        }
-
         @foreach (var action in model.Actions)
         {
           <div>
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientv2CodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientv2CodeFile.cshtml
deleted file mode 100644
index cfcc89716..000000000
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientv2CodeFile.cshtml
+++ /dev/null
@@ -1,59 +0,0 @@
-@{
-    Tango.CodeGeneration.TangoWebClientv2CodeFile model = Model as Tango.CodeGeneration.TangoWebClientv2CodeFile;
-}
-using System;
-using System.Threading.Tasks;
-using Tango.Web;
-
-namespace @(model.Namespace)
-{
-    /// <summary>
-    /// Represents a machine service @(model.ControllerName) web client.
-    /// </summary>
-    /// <seealso cref="Tango.Web.TangoWebClient" />
-    public abstract class @(model.Name) : TangoWebClientV2<@(model.LoginRequest), @(model.LoginResponse)>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="@(model.Name)"/> class.
-        /// </summary>
-        /// <param name="address">The service address.</param>
-        /// <param name="token">Existing token.</param>
-        public @(model.Name)(String address, String token) : base(address, "@(model.ControllerName)", token)
-        {
-            
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="@(model.Name)"/> class.
-        /// </summary>
-        /// <param name="address">The service address.</param>
-        public @(model.Name)(String address) : this(address, null)
-        {
-
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="@(model.Name)"/> class.
-        /// </summary>
-        /// <param name="cloned">Other instance.</param>
-        public @(model.Name)(@(model.Name) cloned) : base(cloned)
-        {
-
-        }
-
-        @foreach (var action in model.Actions)
-        {
-          <div>
-            /// <summary>
-            /// Executes the @(action.Name) action and returns @(action.Response).
-            /// </summary>
-            /// <returns></returns>
-            public Task<@(action.Response)> @(action.Name)(@(action.Request) request)
-            {
-                return Post<@(action.Request), @(action.Response)>("@(action.Name)", request);
-            }
-
-          </div>
-        }
-    }
-}
\ No newline at end of file