WIP

Church.Net.Entity2/Contribution.cs

@@ -0,0 +1,23 @@
+using Church.Net.Entity.Interface;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using System.ComponentModel;
+
+namespace Church.Net.Entity
+{
+    public class Contribution : IEntity
+    {
+        [ForeignKey("HappinessGroup")]
+        public string GroupId { get; set; }
+        public PastoralDomain HappinessGroup { get; set; }
+        [Key]
+        public string Id { get; set; }
+        public string Contributor { get; set; }
+        public decimal Amount { get; set; }
+        public string Comment { get; set; }
+        public DateTime Time { get; set; }
+    }
+}

Church.Net.Entity2/HappinessWeek.cs

@@ -29,6 +29,7 @@ namespace Church.Net.Entity
         [NotMapped]
         public string Topic { get; set; }
         public virtual ICollection<HappinessTask> Tasks { get; set; }
+        public virtual ICollection<HappinessCost> Costs { get; set; }
         public string Comment { get; set; }
     }
 
@@ -58,4 +59,18 @@ namespace Church.Net.Entity
         public string Tasker { get; set; }
         public string Content { get; set; }
     }
+    public class HappinessCost : IEntity
+    {
+        [ForeignKey("HappinessWeek")]
+        public string WeekId { get; set; }
+        public HappinessWeek HappinessWeek { get; set; }
+        [Key]
+        public string Id { get; set; }
+        public string Tasker { get; set; }
+        public string Content { get; set; }
+        public decimal Amount { get; set; }
+    }
+
+
+
 }

Church.Net.Entity2/PastoralDomain.cs

@@ -16,7 +16,7 @@ namespace Church.Net.Entity
         HappinessGroup,
         CellGroupCoworker,
         ChurchCoworker,
-        Person = 99
+        Administrator = 99
     }
     public class PastoralDomain : IEntity, IMessengerClient
     {
@@ -57,9 +57,11 @@ namespace Church.Net.Entity
 
         public DomainType Type { get; set; }
         public DateTime? ServiceTime { get; set; }
+        public string TimeZone { get; set; }
         public virtual ICollection<HappinessBEST> Bests { get; set; }
         public virtual ICollection<HappinessWeek> HappinessWeeks { get; set; }
-
+        public virtual ICollection<Contribution> Contributions { get; set; }
+        
         [JsonIgnore]
         public virtual ICollection<PastoralDomainMembers> Members { get; set; }
         [JsonIgnore]