From 63a830c8e3493336af335e8c837aaa0624533710 Mon Sep 17 00:00:00 2001 From: TekH Date: Tue, 19 Aug 2025 14:26:14 +0200 Subject: [PATCH] refactor(DocumentReceiverElement): Trenne .NET- und .NET Framework-spezifische Initialisierung in DocumentReceiverElement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Verschiebe Standardwerte für Id, Required, ReadOnly und AnnotationIndex in den Konstruktor für .NET Framework - Passe #if-Direktiven an, um Namensräume und NotMapped-Eigenschaften korrekt zu handhaben - Entferne redundante Standardwert-Zuweisungen bei Property-Deklarationen - Bereite Klasse für plattformübergreifende Nutzung vor --- .../Entities/DocumentReceiverElement.cs | 181 ++++++++++-------- 1 file changed, 99 insertions(+), 82 deletions(-) diff --git a/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs b/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs index 76bb028e..aba4ab66 100644 --- a/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs +++ b/EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs @@ -6,93 +6,110 @@ using System; #endif namespace EnvelopeGenerator.Domain.Entities -{ - [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")] - public class DocumentReceiverElement +#if NET + ; +#elif NETFRAMEWORK { - // TODO: * Check the Form App and remove the default value - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - [Column("GUID")] - public int Id { get; set; } = -1; - - [Required] - [Column("DOCUMENT_ID")] - public int DocumentId { get; set; } - - [Required] - [Column("RECEIVER_ID")] - public int ReceiverId { get; set; } - - [Required] - [Column("ELEMENT_TYPE")] - [DefaultValue(0)] - public int ElementType { get; set; } - - [Required] - [Column("POSITION_X")] - [DefaultValue(0)] - public double X { get; set; } - - [Required] - [Column("POSITION_Y")] - [DefaultValue(0)] - public double Y { get; set; } - - [Required] - [Column("WIDTH")] - [DefaultValue(0)] - public double Width { get; set; } - - [Required] - [Column("HEIGHT")] - [DefaultValue(0)] - public double Height { get; set; } - - [Required] - [Column("PAGE")] - [DefaultValue(1)] - public int Page { get; set; } - - // TODO: * Check the Form App and remove the default value - [Required] - [Column("REQUIRED")] - [DefaultValue(false)] - public bool Required { get; set; } = false; - - [Column("TOOLTIP")] - public string Tooltip { get; set; } - - // TODO: * Check the Form App and remove the default value - [Required] - [Column("READ_ONLY")] - [DefaultValue(false)] - public bool ReadOnly { get; set; } = false; +#endif +[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")] +public class DocumentReceiverElement +{ + public DocumentReceiverElement() + { // TODO: * Check the Form App and remove the default value - [Required] - [Column("ANNOTATION_INDEX")] - [DefaultValue(0)] - public int AnnotationIndex { get; set; } = 0; - - [Required] - [Column("ADDED_WHEN", TypeName = "datetime")] - [DefaultValue("GETDATE()")] - public DateTime AddedWhen { get; set; } - - [Column("CHANGED_WHEN", TypeName = "datetime")] - public DateTime ChangedWhen { get; set; } +#if NETFRAMEWORK + Id = -1; + Required = false; + ReadOnly = false; + AnnotationIndex = 0; +#endif + } - [ForeignKey("DocumentId")] - public virtual EnvelopeDocument Document { get; set; } + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [Column("GUID")] + public int Id { get; set; } + + [Required] + [Column("DOCUMENT_ID")] + public int DocumentId { get; set; } + + [Required] + [Column("RECEIVER_ID")] + public int ReceiverId { get; set; } + + [Required] + [Column("ELEMENT_TYPE")] + [DefaultValue(0)] + public int ElementType { get; set; } + + [Required] + [Column("POSITION_X")] + [DefaultValue(0)] + public double X { get; set; } + + [Required] + [Column("POSITION_Y")] + [DefaultValue(0)] + public double Y { get; set; } + + [Required] + [Column("WIDTH")] + [DefaultValue(0)] + public double Width { get; set; } + + [Required] + [Column("HEIGHT")] + [DefaultValue(0)] + public double Height { get; set; } + + [Required] + [Column("PAGE")] + [DefaultValue(1)] + public int Page { get; set; } + + [Required] + [Column("REQUIRED")] + [DefaultValue(false)] + public bool Required { get; set; } + + [Column("TOOLTIP")] + public string Tooltip { get; set; } + + [Required] + [Column("READ_ONLY")] + [DefaultValue(false)] + public bool ReadOnly { get; set; } + + [Required] + [Column("ANNOTATION_INDEX")] + [DefaultValue(0)] + public int AnnotationIndex { get; set; } + + [Required] + [Column("ADDED_WHEN", TypeName = "datetime")] + [DefaultValue("GETDATE()")] + public DateTime AddedWhen { get; set; } + + [Column("CHANGED_WHEN", TypeName = "datetime")] + public DateTime ChangedWhen { get; set; } + + [ForeignKey("DocumentId")] + public virtual EnvelopeDocument Document { get; set; } + + [ForeignKey("ReceiverId")] + public virtual Receiver Receiver { get; set; } - [ForeignKey("ReceiverId")] - public virtual Receiver Receiver { get; set; } +#if NETFRAMEWORK + [NotMapped] + public double Top => Math.Round(Y, 5); - [NotMapped] - public double Top => Math.Round(Y, 5); + [NotMapped] + public double Left => Math.Round(X, 5); +#endif +} - [NotMapped] - public double Left => Math.Round(X, 5); +#if NETFRAMEWORK } -} \ No newline at end of file +#endif \ No newline at end of file