Univate.2 > Timeshare To Sell Changes

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedOwner.cs

@@ -17,10 +17,48 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
             Surname = individual.Surname;
             IdNumber = individual.IdNumber;
             CompanyRegNumber = individual.CompanyRegNumber;
-            MaritalStatus = individual.MaritalStatus;
+            MaritalStatus = individual.HowMarried.ToString();
             EmailAddress = individual.Email;
             CellNumber = individual.CellNumber;
             LandlineNumber = individual.Telephone;
+            SpouseCellnumber = individual.SpouseCellnumber;
+            SpouseEmail = individual.SpouseEmail;
+            SpouseName = individual.SpouseName;
+            SpouseSurname = individual.SpouseSurname;
+            SpouseTelephone = individual.SpouseTelephone;
+            switch (individual.HowMarried)
+            {
+                case MarriedType.NotApplicable:
+                    HowMarried = "N/A";
+                    break;
+                case MarriedType.ICOP:
+                    HowMarried = "In Community Of Property";
+                    break;
+                case MarriedType.OCOP:
+                    HowMarried = "Out of Community Of Property";
+                    break;
+                case MarriedType.Other:
+                    HowMarried = "Other";
+                    break;
+                case MarriedType.Traditional:
+                    HowMarried = "Traditional Wedding";
+                    break;
+                case MarriedType.Single:
+                    HowMarried = "Single";
+                    break;
+                case MarriedType.Divorced:
+                    HowMarried = "Divorced";
+                    break;
+                case MarriedType.Widow:
+                    HowMarried = "Widow";
+                    break;
+                case MarriedType.CommittedRelationship:
+                    HowMarried = "Committed Relationship";
+                    break;
+                case MarriedType.Partner:
+                    HowMarried = "Partner";
+                    break;
+            }
             if (individual.Address != null)
             {
                 Address = individual.Address != null ? new DetailedAddress(individual.Address) : new DetailedAddress();
@@ -53,7 +91,13 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
         public string MaritalStatus { get; set; }
         public string EmailAddress { get; set; }
         public string CellNumber { get; set; }
-        public string LandlineNumber { get; set; }
+        public string LandlineNumber { get; set; }  
+        public string HowMarried { get; set; }
+        public string SpouseName { get; set; }
+        public string SpouseSurname { get; set; }        
+        public string SpouseEmail { get; set; }        
+        public string SpouseTelephone { get; set; }        
+        public string SpouseCellnumber { get; set; }
         public DetailedAddress Address { get; set; }
         public DetailedBankDetails BankingDetails { get; set; }
     }

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedWeekDto.cs

@@ -71,7 +71,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
         public string DepartureDate { get; set; }
         public double SellPrice { get; set; }
         public double AgentCommission { get; set; }
-        public string Mandate { get; set; }
+        public bool Mandate { get; set; }
         public string Status { get; set; }
         public DetailedOwner Owner { get; set; }
     }

UnivateProperties_API/Containers/Timeshare/TimeshareWeekDto.cs

@@ -25,6 +25,11 @@ namespace UnivateProperties_API.Containers.Timeshare
         public string EmailAddress { get; set; }
         public string CellNumber { get; set; }
         public string LandlineNumber { get; set; }
+        public string SpouseName { get; set; }
+        public string SpouseSurname { get; set; }
+        public string SpouseEmail { get; set; }
+        public string SpouseTelephone { get; set; }
+        public string SpouseCellnumber { get; set; }
         public OwnerAddress Address { get; set; }
         public OnwerBankingDetails BankingDetails { get; set; }
     }

UnivateProperties_API/Enums.cs

@@ -33,4 +33,18 @@
         Module,
         Syndicate
     }
+
+    public enum MarriedType
+    {        
+        NotApplicable = 0,       
+        ICOP = 1,        
+        OCOP = 2,      
+        Other = 3,
+        Traditional = 4,
+        Single = 5,
+        Divorced = 6,
+        Widow = 7,
+        CommittedRelationship = 8,
+        Partner = 9
+    }
 }

UnivateProperties_API/Migrations/20200909062006_AddSpouseDetails.cs

@@ -0,0 +1,178 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class AddSpouseDetails : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "HowMarried",
+                table: "Person",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseCellnumber",
+                table: "Person",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseEmail",
+                table: "Person",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseName",
+                table: "Person",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseSurname",
+                table: "Person",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseTelephone",
+                table: "Person",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "HowMarried",
+                table: "Individuals",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseCellnumber",
+                table: "Individuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseEmail",
+                table: "Individuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseName",
+                table: "Individuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseSurname",
+                table: "Individuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseTelephone",
+                table: "Individuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "HowMarried",
+                table: "Agents",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseCellnumber",
+                table: "Agents",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseEmail",
+                table: "Agents",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseName",
+                table: "Agents",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseSurname",
+                table: "Agents",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseTelephone",
+                table: "Agents",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "HowMarried",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseCellnumber",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseEmail",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseName",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseSurname",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseTelephone",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "HowMarried",
+                table: "Individuals");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseCellnumber",
+                table: "Individuals");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseEmail",
+                table: "Individuals");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseName",
+                table: "Individuals");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseSurname",
+                table: "Individuals");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseTelephone",
+                table: "Individuals");
+
+            migrationBuilder.DropColumn(
+                name: "HowMarried",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseCellnumber",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseEmail",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseName",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseSurname",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseTelephone",
+                table: "Agents");
+        }
+    }
+}

UnivateProperties_API/Migrations/20200909075339_PropertiesMoved.cs

@@ -0,0 +1,132 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class PropertiesMoved : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "HowMarried",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseCellnumber",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseEmail",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseName",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseSurname",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseTelephone",
+                table: "Person");
+
+            migrationBuilder.DropColumn(
+                name: "MaritalStatus",
+                table: "Individuals");
+
+            migrationBuilder.DropColumn(
+                name: "HowMarried",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseCellnumber",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseEmail",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseName",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseSurname",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseTelephone",
+                table: "Agents");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "HowMarried",
+                table: "Person",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseCellnumber",
+                table: "Person",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseEmail",
+                table: "Person",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseName",
+                table: "Person",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseSurname",
+                table: "Person",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseTelephone",
+                table: "Person",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MaritalStatus",
+                table: "Individuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "HowMarried",
+                table: "Agents",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseCellnumber",
+                table: "Agents",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseEmail",
+                table: "Agents",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseName",
+                table: "Agents",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseSurname",
+                table: "Agents",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseTelephone",
+                table: "Agents",
+                nullable: true);
+        }
+    }
+}

UnivateProperties_API/Migrations/20200909084924_TimeshareAmmendment.cs

@@ -0,0 +1,38 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    //run before update: UPDATE weeks SET Mandate = 0
+    public partial class TimeshareAmmendment : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<bool>(
+                name: "Mandate",
+                table: "Weeks",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldNullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "DateMandated",
+                table: "Weeks",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DateMandated",
+                table: "Weeks");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Mandate",
+                table: "Weeks",
+                nullable: true,
+                oldClrType: typeof(bool));
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -975,6 +975,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<bool>("CurrentYearBanked");
 
+                    b.Property<DateTime>("DateMandated");
+
                     b.Property<DateTime>("DepartureDate");
 
                     b.Property<bool>("IsDeleted");
@@ -983,7 +985,7 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<double>("LevyAmount");
 
-                    b.Property<string>("Mandate");
+                    b.Property<bool>("Mandate");
 
                     b.Property<int>("MaxSleep");
 
@@ -1180,20 +1182,30 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("Email");
 
+                    b.Property<int>("HowMarried");
+
                     b.Property<string>("IdNumber");
 
                     b.Property<string>("IncomeTaxNumber");
 
                     b.Property<bool>("IsDeleted");
 
-                    b.Property<string>("MaritalStatus");
-
                     b.Property<DateTime>("Modified");
 
                     b.Property<string>("ModifiedBy");
 
                     b.Property<string>("Name");
 
+                    b.Property<string>("SpouseCellnumber");
+
+                    b.Property<string>("SpouseEmail");
+
+                    b.Property<string>("SpouseName");
+
+                    b.Property<string>("SpouseSurname");
+
+                    b.Property<string>("SpouseTelephone");
+
                     b.Property<string>("Surname");
 
                     b.Property<string>("Telephone");

UnivateProperties_API/Model/Timeshare/TimeshareWeek.cs

@@ -14,7 +14,7 @@ namespace UnivateProperties_API.Model.Timeshare
         {
         }
 
-        public TimeshareWeek(bool referedByAgent, int? agentId, int? agencyId, int ownerId, bool agentAsRep, bool otherResort, string otherResortName, string resortCode, string resortName, int regionId, string season, string module, int bedrooms, int maxSleep, string unitNumber, string weekNumber, double levyAmount, bool currentYearBanked, string bankedWith, bool leviesPaidInFull, bool weekPlacedForRental, double originalPurchasePrice, DateTime originalPurchaseDate, DateTime arrivalDate, DateTime departureDate, double sellPrice, double agentCommision, string mandate, int statusId, Status status, Province region, Individual owner, Agent agent, Agency agency, ICollection<BidItem> bidItems, ICollection<ProcessFlow.ProcessFlow> processFlows)
+        public TimeshareWeek(bool referedByAgent, int? agentId, int? agencyId, int ownerId, bool agentAsRep, bool otherResort, string otherResortName, string resortCode, string resortName, int regionId, string season, string module, int bedrooms, int maxSleep, string unitNumber, string weekNumber, double levyAmount, bool currentYearBanked, string bankedWith, bool leviesPaidInFull, bool weekPlacedForRental, double originalPurchasePrice, DateTime originalPurchaseDate, DateTime arrivalDate, DateTime departureDate, double sellPrice, double agentCommision, bool mandate, int statusId, Status status, Province region, Individual owner, Agent agent, Agency agency, ICollection<BidItem> bidItems, ICollection<ProcessFlow.ProcessFlow> processFlows)
         {
             ReferedByAgent = referedByAgent;
             AgentId = agentId;
@@ -90,7 +90,8 @@ namespace UnivateProperties_API.Model.Timeshare
         
         public double SellPrice { get; set; }
         public double AgentCommision { get; set; }
-        public string Mandate { get; set; }
+        public bool Mandate { get; set; }
+        public DateTime DateMandated { get; set; }
 
         [ForeignKey("Status")]
         public int StatusId { get; set; }

UnivateProperties_API/Model/Users/Individual.cs

@@ -20,13 +20,22 @@ namespace UnivateProperties_API.Model.Users
 
         #region Properties
         public string IdNumber { get; set; }
-        public string CompanyRegNumber { get; set; }
-        public string MaritalStatus { get; set; }
+        public string CompanyRegNumber { get; set; }        
         [ForeignKey("Address")]
         public int? AddressId { get; set; }
         public string IncomeTaxNumber { get; set; }
         [ForeignKey("BankAccount")]
         public int? BankAccountId { get; set; }
+        public MarriedType HowMarried { get; set; }
+        public string SpouseName { get; set; }
+        public string SpouseSurname { get; set; }
+        [DataType(DataType.EmailAddress)]
+        public string SpouseEmail { get; set; }
+        [Phone]
+        public string SpouseTelephone { get; set; }
+        [Phone]
+        public string SpouseCellnumber { get; set; }
+
         public virtual Address Address { get; set; }
         public virtual BankAccount BankAccount { get; set; }
         public virtual ICollection<Property> Properties { get; set; }
@@ -40,8 +49,7 @@ namespace UnivateProperties_API.Model.Users
                 Name = owner.Name;
                 Surname = owner.Surname;
                 IdNumber = owner.IdNumber;
-                CompanyRegNumber = owner.CompanyRegNumber;
-                MaritalStatus = owner.MaritalStatus;
+                CompanyRegNumber = owner.CompanyRegNumber;                
                 Email = owner.EmailAddress;
                 CellNumber = owner.CellNumber;
                 Telephone = owner.LandlineNumber;

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -290,6 +290,13 @@ namespace UnivateProperties_API.Repository.Timeshare
 
         public void Update(TimeshareWeek item)
         {
+            var saved = _dbContext.Weeks.Where(w => w.Id == item.Id).FirstOrDefault();
+            if (saved.Mandate != item.Mandate)
+            {
+                if (item.Mandate)
+                    item.DateMandated = DateTime.Now;
+            }
+
             _dbContext.Entry(item).State = EntityState.Modified;
             Save();
         }
@@ -519,12 +526,54 @@ namespace UnivateProperties_API.Repository.Timeshare
             owner.Name = sellItem.OwnerObject.Name;
             owner.Surname = sellItem.OwnerObject.Surname;
             owner.IdNumber = sellItem.OwnerObject.IdNumber;
-            owner.CompanyRegNumber = sellItem.OwnerObject.CompanyRegNumber;
-            owner.MaritalStatus = sellItem.OwnerObject.MaritalStatus;
+            owner.CompanyRegNumber = sellItem.OwnerObject.CompanyRegNumber;            
             owner.Email = sellItem.OwnerObject.EmailAddress;
             owner.CellNumber = sellItem.OwnerObject.CellNumber;
             owner.Telephone = sellItem.OwnerObject.LandlineNumber;
 
+            switch (sellItem.OwnerObject.MaritalStatus.ToUpper())
+            {
+                case "N/A":
+                    owner.HowMarried = MarriedType.NotApplicable;
+                    break;
+                case "IN COMMUNITY OF PROPERTY":
+                    owner.HowMarried = MarriedType.ICOP;
+                    break;
+                case "OUT OF COMMUNITY OF PROPERTY":
+                    owner.HowMarried = MarriedType.OCOP;
+                    break;
+                case "OTHER":
+                    owner.HowMarried = MarriedType.Other;
+                    break;
+                case "TRADITIONAL WEDDING":
+                    owner.HowMarried = MarriedType.Traditional;
+                    break;
+                case "SINGLE":
+                    owner.HowMarried = MarriedType.Single;
+                    break;
+                case "DIVORCED":
+                    owner.HowMarried = MarriedType.Divorced;
+                    break;
+                case "WIDOW":
+                    owner.HowMarried = MarriedType.Widow;
+                    break;
+                case "COMMITTED RELATIONSHIP":
+                    owner.HowMarried = MarriedType.CommittedRelationship;
+                    break;
+                case "PARTNER":
+                    owner.HowMarried = MarriedType.Partner;
+                    break;
+                default:
+                    owner.HowMarried = MarriedType.NotApplicable;
+                    break;
+            }
+
+            owner.SpouseCellnumber = sellItem.OwnerObject.SpouseCellnumber;
+            owner.SpouseEmail = sellItem.OwnerObject.SpouseEmail;
+            owner.SpouseName = sellItem.OwnerObject.SpouseName;
+            owner.SpouseSurname = sellItem.OwnerObject.SpouseSurname;
+            owner.SpouseTelephone = sellItem.OwnerObject.SpouseSurname;
+
             if (owner.Id == 0)
             {
                 _dbContext.Add(owner);
@@ -546,6 +595,8 @@ namespace UnivateProperties_API.Repository.Timeshare
             week.Region = null;
             week.RegionId = sellItem.Region.Id;
             week.OwnerId = owner.Id;
+            if (week.Mandate)
+                week.DateMandated = DateTime.Now;
 
             TemplateRepository templateRepository = new TemplateRepository(_dbContext);