Identity reloaded

src/Yavsc.Server/Models/ApplicationDbContext.cs

@@ -290,22 +290,17 @@ namespace Yavsc.Models
 
         public DbSet<Instrument> Instrument { get; set; }
 
-        [ActivitySettings]
         public DbSet<DjSettings> DjSettings { get; set; }
 
-        [ActivitySettings]
         public DbSet<Instrumentation> Instrumentation { get; set; }
 
-        [ActivitySettings]
         public DbSet<FormationSettings> FormationSettings { get; set; }
 
-        [ActivitySettings]
-        public DbSet<MusicLoverSettings> GeneralSettings { get; set; }
+        public DbSet<MusicLoverSettings> MusicLoverSettings { get; set; }
         public DbSet<CoWorking> CoWorking { get; set; }
 
-        private void AddTimestamps(string userId)
-        {
-            var entities =
+        private void AddTimestamps(string userId) 
+        {            var entities =
             ChangeTracker.Entries()
             .Where(x => x.Entity.GetType().GetInterface(nameof(ITrackedEntity)) != null
             && (x.State == EntityState.Added || x.State == EntityState.Modified));
@@ -360,7 +355,6 @@ namespace Yavsc.Models
         public DbSet<DismissClicked> DismissClicked { get; set; }
 
 
-        [ActivitySettings]
         public DbSet<BrusherProfile> BrusherProfile { get; set; }
 
         public DbSet<BankIdentity> BankIdentity { get; set; }

src/Yavsc.Server/Models/Billing/NominativeServiceCommand.cs

@@ -59,14 +59,14 @@ namespace Yavsc.Models.Billing
     /// <summary>
     /// The performer identifier
     /// </summary>
-    [ForeignKey("PerformerId"),Display(Name="Préstataire")]
+    [ForeignKey("PerformerId"),Display(Name="PerformerProfile")]
     public PerformerProfile PerformerProfile { get; set; }
 
     public DateTime? ValidationDate {get; set;}
 
 
-    [Display(Name="Previsional")]
-    public decimal? Previsional { get; set; }
+    [Display(Name="Provisional")]
+    public decimal? Provisional { get; set; }
     /// <summary>
     /// The bill
     /// </summary>
@@ -82,7 +82,7 @@ namespace Yavsc.Models.Billing
 
         public bool GetIsAcquitted()
         {
-            return Regularisation?.IsOk() ?? false;
+            return Regularization?.IsOk() ?? false;
         }
 
         public string GetFileBaseName(IBillingService billingService)
@@ -93,11 +93,11 @@ namespace Yavsc.Models.Billing
             return $"facture-{bcode}-{Id}{ack}";
         }
 
-        [ForeignKey("Regularisation")]
+        [ForeignKey("Regularization")]
 
         public string? PaymentId { get; set; }
 
         [Display(Name = "Acquittement de la facture")]
-        public virtual PayPalPayment Regularisation { get; set; }
+        public virtual PayPalPayment Regularization { get; set; }
     }
 }

src/Yavsc.Server/Models/HairCut/HairCutQuery.cs

@@ -400,7 +400,7 @@ Prestation.Gender == HairCutGenders.Women ?
                     UserId = ClientId,
                     Avatar = Client.Avatar
                 },
-                Previsional = Previsional,
+                Previsional = Provisional,
                 EventDate = EventDate,
                 Location = Location,
                 Id = Id,

src/Yavsc.Server/Models/HairCut/HairMultiCutQuery.cs

@@ -8,33 +8,20 @@ using Yavsc.Billing;
 
 namespace Yavsc.Models.Haircut
 {
-    public class HairPrestationCollectionItem {
-
-        [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public long Id { get; set; }
-        public long PrestationId { get; set; }
-        [ForeignKeyAttribute("PrestationId")]
-        public virtual HairPrestation Prestation { get; set; }
-
-        public long QueryId { get; set; }
-
-        [ForeignKeyAttribute("QueryId")]
-        public virtual HairMultiCutQuery Query { get; set; }
-    }
 
     public class HairMultiCutQuery : NominativeServiceCommand
     {
         // Bill description
-        string _customDescription = null; 
-        public override string Description 
+        string _customDescription = null;
+        public override string Description
         {
-            get { 
+            get {
                 return _customDescription ?? "Prestation en coiffure à domicile [commande groupée]" ;
             }
             set {
                 _customDescription = value;
             }
-        } 
+        }
 
         [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         override public long Id { get; set; }

src/Yavsc.Server/Models/HairCut/HairPrestationCollectionItem.cs

@@ -0,0 +1,19 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Yavsc.Models.Haircut
+{
+    public class HairPrestationCollectionItem {
+
+        [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public long Id { get; set; }
+        public long PrestationId { get; set; }
+        [ForeignKeyAttribute("PrestationId")]
+        public virtual HairPrestation Prestation { get; set; }
+
+        public long QueryId { get; set; }
+
+        [ForeignKeyAttribute("QueryId")]
+        public virtual HairMultiCutQuery Query { get; set; }
+    }
+}