bill

Yavsc/Models/ApplicationDbContext.cs

@@ -60,21 +60,7 @@ namespace Yavsc.Models
             }
 
         }
-        public DbSet<TSettings> GetDbSet<TSettings>() where TSettings : class,  ISpecializationSettings
 
-        {
-            return (DbSet<TSettings>) GetDbSet(typeof(TSettings).FullName);
-        }
-        public IQueryable<ISpecializationSettings> GetDbSet(string settingsClassName)
-        {
-            var dbSetPropInfo = Startup.GetUserSettingPropertyInfo(settingsClassName);
-            if (dbSetPropInfo == null) return null;
-            // var settingType = dbSetPropInfo.PropertyType;
-            // var dbSetType = typeof(DbSet<>).MakeGenericType(new Type[] { settingType } );
-            // avec une info method Remove et Update, ça le ferait ...
-
-            return (IQueryable<ISpecializationSettings>) dbSetPropInfo.GetValue(this);
-        }
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             optionsBuilder.UseNpgsql(Startup.ConnectionString);
@@ -107,23 +93,18 @@ namespace Yavsc.Models
         /// <returns></returns>
         public DbSet<CircleMember> CircleMembers { get; set; }
 
-        /// <summary>
-        /// Commands, from an user, to a performer
-        /// (A performer is an user who's actived a main activity
-        /// on his profile).
-        /// </summary>
-        /// <returns></returns>
-        public DbSet<RdvQuery> Commands { get; set; }
         /// <summary>
         /// Special commands, talking about
         /// a given place and date.
         /// </summary>
-        /// <returns></returns>
         public DbSet<RdvQuery> RdvQueries { get; set; }
+
         public DbSet<HairCutQuery> HairCutQueries { get; set; }
         public DbSet<HairPrestation> HairPrestation { get; set; }
+
         public DbSet<HairMultiCutQuery> HairMultiCutQueries { get; set; }
         public DbSet<PerformerProfile> Performers { get; set; }
+
         public DbSet<Estimate> Estimates { get; set; }
         public DbSet<AccountBalance> BankStatus { get; set; }
         public DbSet<BalanceImpact> BankBook { get; set; }

Yavsc/Models/Billing/NominativeServiceCommand.cs

@@ -82,5 +82,6 @@ namespace Yavsc.Models.Billing
 
         [ForeignKey("PaymentId"), Display(Name = "Acquittement de la facture")]
         public virtual PayPalPayment Regularisation { get; set; }
+
     }
 }

Yavsc/Models/Billing/satisfaction.cs

@@ -1,17 +0,0 @@
-
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Yavsc.Models.Billing
-{
-    public partial class satisfaction
-    {
-        [Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public long _id { get; set; }
-        public string comnt { get; set; }
-        public int? rate { get; set; }
-
-        [ForeignKey("Skill.Id")]
-        public long? userskillid { get; set; }
-    }
-}

Yavsc/Models/Billing/writtings.cs

@@ -1,13 +0,0 @@
-
-namespace Yavsc.Models.Billing
-{
-    public partial class writtings
-    {
-        public long _id { get; set; }
-        public int? count { get; set; }
-        public string description { get; set; }
-        public long estimid { get; set; }
-        public string productid { get; set; }
-        public decimal? ucost { get; set; }
-    }
-}

Yavsc/Models/Billing/wrtags.cs

@@ -1,9 +0,0 @@
-
-namespace Yavsc.Models.Billing
-{
-    public partial class wrtags
-    {
-        public long wrid { get; set; }
-        public long tagid { get; set; }
-    }
-}

Yavsc/Models/Relationship/Circle.cs

@@ -16,7 +16,7 @@ namespace Yavsc.Models.Relationship
         [ForeignKey("OwnerId"),JsonIgnore,NotMapped]
         public virtual ApplicationUser Owner { get; set; }
 
-        [InverseProperty("Circle")]
+        [InverseProperty("Circle"),JsonIgnore]
         public virtual List<CircleMember> Members { get; set; }
     }
 }

Yavsc/Models/Workflow/PerformerProfile.cs

@@ -6,6 +6,7 @@ namespace Yavsc.Models.Workflow
 {
     using System;
     using Models.Relationship;
+    using Newtonsoft.Json;
     using Yavsc.Workflow;
 
     public class PerformerProfile : IPerformerProfile {
@@ -16,7 +17,7 @@ namespace Yavsc.Models.Workflow
         public virtual ApplicationUser Performer { get; set; }
 
         [InverseProperty("User")]
-        [Display(Name="Activity")]
+        [Display(Name="Activity"), JsonIgnore]
         public virtual List<UserActivity> Activity { get; set; }
 
         [Required,StringLength(14),Display(Name="SIREN"),