Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 21 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
index ee2d2ea12..873668545 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
@@ -20,6 +20,14 @@ using Tango.DAL.Remote.DB;
 
 namespace Tango.BL.Entities
 {
+    @if (Model.Description != null)
+    {
+        <div>
+        /// <summary>
+        /// @(Model.Description)
+        /// </summary>
+        </div>
+    }
     [Table("@(Model.TableName)")]
     public partial class @(Model.Name) : ObservableEntity<@(Model.Name)>
     {
@@ -27,9 +35,22 @@ namespace Tango.BL.Entities
         {
     <div>
         protected @(prop.Type) _@(prop.Name.ToLower());
+        @if (prop.DbDescription != null)
+        {
+        <div>
+        /// <summary>
+        @(prop.DbDescription)
+        /// </summary>
+        </div>
+        }
+        else
+        {
+        <div>
         /// <summary>
         /// Gets or sets the @(Model.Name.ToLower()) @(prop.Description).
         /// </summary>
+        </div>
+        }
         @(!prop.Construct && !prop.Complex ? "[Column(\"" + prop.FieldName + "\")]" : "")
         @(prop.IsForeignKey ? "[ForeignKey(\"" + prop.ForeignKeyName + "\")]" : "")
         @(prop.XmlIgnore ? "[XmlIgnore]" : "")