From d33c19b3ac6803de4b5c8d475832efef131c1a45 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Wed, 30 Dec 2020 15:11:34 +0000 Subject: Revert "Hope it is fine" --- .../Templates/EntityCodeFile.cshtml | 31 ++++++++++-- .../Templates/TangoWebClientCodeFile.cshtml | 9 ++++ .../Templates/TangoWebClientv2CodeFile.cshtml | 59 ++++++++++++++++++++++ 3 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientv2CodeFile.cshtml (limited to 'Software/Visual_Studio/Tango.CodeGeneration/Templates') diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml index 950e24f79..76c035df9 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml +++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -67,12 +68,32 @@ namespace Tango.BL.Entities @(prop.IsForeignKey ? "[ForeignKey(\"" + prop.ForeignKeyName + "\")]" : "") @(prop.XmlIgnore ? "[XmlIgnore]" : "") @(prop.XmlIgnore ? "[JsonIgnore]" : "") - @if (prop.RangeDescription != null) + @if (prop.PropertyExtension != null) { -
- [Description("@(prop.RangeDescription.Description)")] - [Range(@(prop.RangeDescription.Min),@(prop.RangeDescription.Max))] -
+ if (prop.PropertyExtension.HasDescription) + { +
+ [Description("@(prop.PropertyExtension.Description)")] +
+ } + if (prop.PropertyExtension.HasRange) + { +
+ [Range(@(prop.PropertyExtension.Min),@(prop.PropertyExtension.Max))] +
+ } + if (prop.PropertyExtension.HasStringFormat) + { +
+ [StringFormat("@(prop.PropertyExtension.StringFormat)")] +
+ } + if (prop.PropertyExtension.HasIndex) + { +
+ [PropertyIndex(@(prop.PropertyExtension.Index))] +
+ } } 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 7d9ebc075..3918ce928 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientCodeFile.cshtml +++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientCodeFile.cshtml @@ -42,6 +42,15 @@ namespace @(model.Namespace) } + /// + /// Initializes a new instance of the class. + /// + /// Other instance. + public @(model.Name)(@(model.Name) cloned) : base(cloned) + { + + } + @foreach (var action in model.Actions) {
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientv2CodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientv2CodeFile.cshtml new file mode 100644 index 000000000..cfcc89716 --- /dev/null +++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientv2CodeFile.cshtml @@ -0,0 +1,59 @@ +@{ + Tango.CodeGeneration.TangoWebClientv2CodeFile model = Model as Tango.CodeGeneration.TangoWebClientv2CodeFile; +} +using System; +using System.Threading.Tasks; +using Tango.Web; + +namespace @(model.Namespace) +{ + /// + /// Represents a machine service @(model.ControllerName) web client. + /// + /// + public abstract class @(model.Name) : TangoWebClientV2<@(model.LoginRequest), @(model.LoginResponse)> + { + /// + /// Initializes a new instance of the class. + /// + /// The service address. + /// Existing token. + public @(model.Name)(String address, String token) : base(address, "@(model.ControllerName)", token) + { + + } + + /// + /// Initializes a new instance of the class. + /// + /// The service address. + public @(model.Name)(String address) : this(address, null) + { + + } + + /// + /// Initializes a new instance of the class. + /// + /// Other instance. + public @(model.Name)(@(model.Name) cloned) : base(cloned) + { + + } + + @foreach (var action in model.Actions) + { +
+ /// + /// Executes the @(action.Name) action and returns @(action.Response). + /// + /// + public Task<@(action.Response)> @(action.Name)(@(action.Request) request) + { + return Post<@(action.Request), @(action.Response)>("@(action.Name)", request); + } + +
+ } + } +} \ No newline at end of file -- cgit v1.3.1