Added new BL entities with inheritance !!!!

4 files changed, 42 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Tango.CodeGeneration/EntityInheritedCodeFile.cs b/Software/Visual_Studio/Tango.CodeGeneration/EntityInheritedCodeFile.cs
new file mode 100644
index 000000000..e9c8ac717
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/EntityInheritedCodeFile.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.CodeGeneration
+{
+    public class EntityInheritedCodeFile : Class
+    {
+        public String BaseClass { get; set; }
+
+        public EntityInheritedCodeFile(String name, String baseClass)
+        {
+            Name = name;
+            BaseClass = baseClass;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
index ef89bd682..436bfae33 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
@@ -68,6 +68,7 @@
     <Compile Include="EntityCodeFileJavaExtension.cs" />
     <Compile Include="EntityCodeFileJava.cs" />
     <Compile Include="EntityCodeFile.cs" />
+    <Compile Include="EntityInheritedCodeFile.cs" />
     <Compile Include="EnumerationField.cs" />
     <Compile Include="ObservablesContextCodeFile.cs" />
     <Compile Include="ObservablesStaticCollectionsFile.cs" />
@@ -116,11 +117,12 @@
     <EmbeddedResource Include="Templates\ProtoEnumFile.cshtml" />
     <EmbeddedResource Include="Templates\EntityCodeFileJavaExtension.cshtml" />
     <EmbeddedResource Include="Templates\ObservablesStaticCollectionsFile.cshtml" />
+    <EmbeddedResource Include="Templates\EntityInheritedCodeFile.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
index dfcceb1dd..698a79b34 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
@@ -30,7 +30,7 @@ namespace Tango.BL.Entities
         </div>
     }
     [Table("@(Model.TableName)")]
-    public partial class @(Model.Name) : ObservableEntity<@(Model.Name)>
+    public abstract class @(Model.Name) : ObservableEntity<@(Model.Name.Replace("Base",""))>
     {
         @foreach (var prop in Model.Fields)
         {
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityInheritedCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityInheritedCodeFile.cshtml
new file mode 100644
index 000000000..2f54067a2
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityInheritedCodeFile.cshtml
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Entities
+{
+    public partial class @(Model.Name) : @(Model.BaseClass)
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="@(Model.Name)" /> class.
+        /// </summary>
+        public @(Model.Name)() : base()
+        {
+            
+        }
+    }
+}
\ No newline at end of file