From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Templates/EntityCodeFile.cshtml                | 31 ++++------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

(limited to 'Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml')

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)
         {
-- 
cgit v1.3.1