Egalware/SHERPA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fit model x resx, tag, tag2item

Browse Source
This commit is contained in:
Samuele Locatelli
2021-12-02 15:52:39 +01:00
parent 500b3b047c
commit 1186b82df1
6 changed files with 103 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SHERPA.BBM.CORE/DbModels/MigrationHistory.cs
-15
View File
@@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
#nullable disable
namespace SHERPA.BBM.CORE.DbModels
{
public partial class MigrationHistory
{
public string MigrationId { get; set; }
public string ContextKey { get; set; }
public byte[] Model { get; set; }
public string ProductVersion { get; set; }
}
}
SHERPA.BBM.CORE/DbModels/ResourcesModel.cs
+27 -7
View File
@@ -16,18 +16,26 @@ namespace SHERPA.BBM.CORE.DbModels
[Table("Resources")]
public partial class ResourcesModel
{
[Key, Column("ResourceId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int ResourceId { get; set; }
[Column("DocId")]
public int DocId { get; set; }
public int Ordinal { get; set; }
[Column("Anno")]
public int Anno { get; set; } = DateTime.Today.Year;
[Column("Ordinal")]
public int Ordinal { get; set; } = 0;
[Column("ItemId")]
public int ItemId { get; set; }
public double QtyPrev { get; set; }
public double QtyOff { get; set; }
public double UnitPriceOff { get; set; }
public double FinalPrice { get; set; }
public string Note { get; set; }
public int Anno { get; set; }
[Column("QtyPrev")]
public double QtyPrev { get; set; } = 1;
[Column("QtyOff")]
public double QtyOff { get; set; } = 1;
[NotMapped]
public double StdPrice
{
@@ -36,6 +44,14 @@ namespace SHERPA.BBM.CORE.DbModels
return UnitPriceOff * QtyOff;
}
}
[Column("UnitPriceOff")]
public double UnitPriceOff { get; set; }
[Column("FinalPrice")]
public double FinalPrice { get; set; }
[Column("Note")]
public string Note { get; set; } = "";
[NotMapped]
[DisplayFormat(DataFormatString = "{0:P2}", ApplyFormatInEditMode = true)]
[Range(0, 1, ErrorMessage = "Percentuale fino a 1=100%")]
@@ -81,7 +97,11 @@ namespace SHERPA.BBM.CORE.DbModels
}
}
[ForeignKey("DocId")]
public virtual DocsModel Document { get; set; }
[ForeignKey("ItemId")]
public virtual ItemsModel Item { get; set; }
}
}
SHERPA.BBM.CORE/DbModels/TagItemModel.cs
+5 -1
View File
@@ -15,11 +15,15 @@ namespace SHERPA.BBM.CORE.DbModels
[Table("Tag2Item")]
public partial class TagItemModel
{
[Column("ItemId")]
public int ItemId { get; set; }
[Column("TagId")]
public int TagId { get; set; }
[ForeignKey("ItemId")]
public virtual ItemsModel Item { get; set; }
public virtual ItemsModel ItemsNav { get; set; }
[ForeignKey("TagId")]
public virtual TagModel TagsNav { get; set; }
SHERPA.BBM.CORE/DbModels/TagModel.cs
+13 -4
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
#nullable disable
@@ -17,14 +18,22 @@ namespace SHERPA.BBM.CORE.DbModels
{
public TagModel()
{
Tag2Items = new HashSet<TagItemModel>();
TagNav = new HashSet<TagItemModel>();
}
[Key, Column("TagId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int TagId { get; set; }
public string CodTag { get; set; }
public string Descript { get; set; }
[Column("CodTag"), MaxLength(50)]
public string CodTag { get; set; } = "";
[Column("Descript"), MaxLength(250)]
public string Descript { get; set; } = "";
[Column("TagType")]
public TagType TagType { get; set; } = TagType.All;
public virtual ICollection<TagItemModel> Tag2Items { get; set; }
public virtual ICollection<TagItemModel> TagNav { get; set; }
}
}
SHERPA.BBM.CORE/SHERPABBMContext.cs
+54 -72
View File
@@ -46,7 +46,6 @@ namespace SHERPA.BBM.CORE
public virtual DbSet<Fatt2DocModel> DbSetFatt2Doc { get; set; }
public virtual DbSet<FluxCountersModel> DbSetCounters { get; set; }
public virtual DbSet<ItemsModel> DbSetItems { get; set; }
public virtual DbSet<MigrationHistory> DbSetMigrationHistories { get; set; }
public virtual DbSet<NegotiationsModel> DbSetNegotiations { get; set; }
public virtual DbSet<ResourcesModel> DbSetResources { get; set; }
public virtual DbSet<TagModel> DbSetTags { get; set; }
@@ -173,96 +172,79 @@ namespace SHERPA.BBM.CORE
// .HasColumnName("UM");
//});
modelBuilder.Entity<MigrationHistory>(entity =>
{
entity.HasKey(e => new { e.MigrationId, e.ContextKey })
.HasName("PK_dbo.__MigrationHistory");
entity.ToTable("__MigrationHistory");
//modelBuilder.Entity<NegotiationsModel>(entity =>
//{
// entity.HasIndex(e => e.BasketId, "IX_BasketId");
entity.Property(e => e.MigrationId).HasMaxLength(150);
// entity.HasIndex(e => e.CustomerId, "IX_CustomerId");
entity.Property(e => e.ContextKey).HasMaxLength(300);
// entity.Property(e => e.CodNegotiation).HasMaxLength(50);
entity.Property(e => e.Model).IsRequired();
// entity.Property(e => e.DataIns).HasColumnType("datetime");
entity.Property(e => e.ProductVersion)
.IsRequired()
.HasMaxLength(32);
});
// entity.Property(e => e.Descript).HasMaxLength(250);
modelBuilder.Entity<NegotiationsModel>(entity =>
{
entity.HasIndex(e => e.BasketId, "IX_BasketId");
// entity.HasOne(d => d.Basket)
// .WithMany(p => p.NegotNav)
// .HasForeignKey(d => d.BasketId)
// .OnDelete(DeleteBehavior.ClientSetNull)
// .HasConstraintName("FK_dbo.Negotiations_dbo.Baskets_BasketId");
entity.HasIndex(e => e.CustomerId, "IX_CustomerId");
// entity.HasOne(d => d.Customer)
// .WithMany(p => p.Negotiations)
// .HasForeignKey(d => d.CustomerId)
// .OnDelete(DeleteBehavior.ClientSetNull)
// .HasConstraintName("FK_dbo.Negotiations_dbo.Customers_CustomerId");
//});
entity.Property(e => e.CodNegotiation).HasMaxLength(50);
//modelBuilder.Entity<ResourcesModel>(entity =>
//{
// entity.HasIndex(e => e.DocId, "IX_DocId")
// .HasFillFactor((byte)100);
entity.Property(e => e.DataIns).HasColumnType("datetime");
// entity.HasIndex(e => e.ItemId, "IX_ItemId")
// .HasFillFactor((byte)100);
entity.Property(e => e.Descript).HasMaxLength(250);
// entity.HasOne(d => d.Document)
// .WithMany(p => p.ResNav)
// .HasForeignKey(d => d.DocId)
// .HasConstraintName("FK_dbo.Resources_dbo.Docs_DocId");
entity.HasOne(d => d.Basket)
.WithMany(p => p.NegotNav)
.HasForeignKey(d => d.BasketId)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("FK_dbo.Negotiations_dbo.Baskets_BasketId");
// entity.HasOne(d => d.Item)
// .WithMany(p => p.ResNav)
// .HasForeignKey(d => d.ItemId)
// .HasConstraintName("FK_dbo.Resources_dbo.Items_ItemId");
//});
entity.HasOne(d => d.Customer)
.WithMany(p => p.Negotiations)
.HasForeignKey(d => d.CustomerId)
.OnDelete(DeleteBehavior.ClientSetNull)
.HasConstraintName("FK_dbo.Negotiations_dbo.Customers_CustomerId");
});
//modelBuilder.Entity<TagModel>(entity =>
//{
// entity.Property(e => e.CodTag).HasMaxLength(50);
modelBuilder.Entity<ResourcesModel>(entity =>
{
entity.HasIndex(e => e.DocId, "IX_DocId")
.HasFillFactor((byte)100);
// entity.Property(e => e.Descript).HasMaxLength(250);
//});
entity.HasIndex(e => e.ItemId, "IX_ItemId")
.HasFillFactor((byte)100);
//modelBuilder.Entity<TagItemModel>(entity =>
//{
// entity.HasKey(e => new { e.ItemId, e.TagId })
// .HasName("PK_dbo.Tag2Item");
entity.HasOne(d => d.Document)
.WithMany(p => p.ResNav)
.HasForeignKey(d => d.DocId)
.HasConstraintName("FK_dbo.Resources_dbo.Docs_DocId");
// entity.ToTable("Tag2Item");
entity.HasOne(d => d.Item)
.WithMany(p => p.ResNav)
.HasForeignKey(d => d.ItemId)
.HasConstraintName("FK_dbo.Resources_dbo.Items_ItemId");
});
// entity.HasIndex(e => e.ItemId, "IX_ItemId");
modelBuilder.Entity<TagModel>(entity =>
{
entity.Property(e => e.CodTag).HasMaxLength(50);
// entity.HasIndex(e => e.TagId, "IX_TagId");
entity.Property(e => e.Descript).HasMaxLength(250);
});
// entity.HasOne(d => d.ItemsNav)
// .WithMany(p => p.TagNav)
// .HasForeignKey(d => d.ItemId)
// .HasConstraintName("FK_dbo.Tag2Item_dbo.Items_ItemId");
modelBuilder.Entity<TagItemModel>(entity =>
{
entity.HasKey(e => new { e.ItemId, e.TagId })
.HasName("PK_dbo.Tag2Item");
entity.ToTable("Tag2Item");
entity.HasIndex(e => e.ItemId, "IX_ItemId");
entity.HasIndex(e => e.TagId, "IX_TagId");
entity.HasOne(d => d.Item)
.WithMany(p => p.TagNav)
.HasForeignKey(d => d.ItemId)
.HasConstraintName("FK_dbo.Tag2Item_dbo.Items_ItemId");
entity.HasOne(d => d.TagsNav)
.WithMany(p => p.Tag2Items)
.HasForeignKey(d => d.TagId)
.HasConstraintName("FK_dbo.Tag2Item_dbo.Tags_TagId");
});
// entity.HasOne(d => d.TagsNav)
// .WithMany(p => p.TagNav)
// .HasForeignKey(d => d.TagId)
// .HasConstraintName("FK_dbo.Tag2Item_dbo.Tags_TagId");
//});
OnModelCreatingPartial(modelBuilder);
}
SHERPA.BBM/DatabaseModels/ResourcesModel.cs
+4 -3
View File
@@ -17,7 +17,7 @@ namespace SHERPA.BBM.DatabaseModels
{
#region Public Properties
[Key, Column("ResourceId", Order = 0), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Key, Column("ResourceId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int ResourceId { get; set; }
[Column("DocId")]
@@ -100,11 +100,12 @@ namespace SHERPA.BBM.DatabaseModels
}
}
[ForeignKey("DocId")]
public virtual DocsModel Document { get; set; }
[ForeignKey("ItemId")]
public virtual ItemsModel Item { get; set; }
[ForeignKey("DocId")]
public virtual DocsModel Document { get; set; }
#endregion Public Properties
}