Checkin timeshare

UnivateProperties_API/Containers/IDisplay.cs

@@ -0,0 +1,7 @@
+namespace UnivateProperties_API.Containers
+{
+    public interface IDisplay
+    {
+        string Display { get; }
+    }
+}

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedAddress.cs

@@ -0,0 +1,39 @@
+using UnivateProperties_API.Model.Misc;
+
+namespace UnivateProperties_API.Containers.Timeshare.Detailed
+{
+    public class DetailedAddress
+    {
+        public DetailedAddress()
+        {
+
+        }
+
+        public DetailedAddress(int id, string streetNumber, string street, string suburb, string city, string postalCode)
+        {
+            Id = id;
+            StreetNumber = streetNumber;
+            Street = street;
+            Suburb = suburb;
+            City = city;
+            PostalCode = postalCode;
+        }
+
+        public DetailedAddress(Address address)
+        {
+            Id = address.Id;
+            StreetNumber = address.StreetNumber;
+            Street = address.Street;
+            Suburb = address.Suburb;
+            City = address.City;
+            PostalCode = address.PostalCode;
+        }
+
+        public int Id { get; set; }
+        public string StreetNumber { get; set; }
+        public string Street { get; set; }
+        public string Suburb { get; set; }
+        public string City { get; set; }
+        public string PostalCode { get; set; }
+    }
+}

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedBankDetails.cs

@@ -0,0 +1,33 @@
+using UnivateProperties_API.Model.Banks;
+
+namespace UnivateProperties_API.Containers.Timeshare.Detailed
+{
+    public class DetailedBankDetails
+    {
+        public DetailedBankDetails()
+        {
+
+        }
+
+        public DetailedBankDetails(int id, int bankId, string accountNumber, string accountHolder)
+        {
+            Id = id;
+            BankId = bankId;
+            AccountHolder = accountHolder;
+            AccountNumber = accountNumber;
+        }
+
+        public DetailedBankDetails(BankAccount bankAccount)
+        {
+            Id = bankAccount.Id;
+            BankId = bankAccount.BankId;
+            AccountHolder = bankAccount.AccountHolder;
+            AccountNumber = bankAccount.AccountNumber;
+        }
+
+        public int Id { get; set; }
+        public int? BankId { get; set; }
+        public string AccountHolder { get; set; }
+        public string AccountNumber { get; set; }
+    }
+}

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedOwner.cs

@@ -0,0 +1,47 @@
+using UnivateProperties_API.Model.Users;
+
+namespace UnivateProperties_API.Containers.Timeshare.Detailed
+{
+    public class DetailedOwner
+    {
+        public DetailedOwner()
+        {
+
+        }
+
+        public DetailedOwner(Individual individual)
+        {
+            Id = individual.Id;
+            Name = individual.Name;
+            Surname = individual.Surname;
+            IdNumber = individual.IdNumber;
+            CompanyRegNumber = individual.CompanyRegNumber;
+            MaritalStatus = individual.MaritalStatus;
+            EmailAddress = individual.Email;
+            CellNumber = individual.CellNumber;
+            LandlineNumber = individual.Telephone;
+            if (individual.Address != null)
+            {
+                Address = new DetailedAddress(individual.Address);
+            }
+            else Address = new DetailedAddress();
+            if (BankingDetails != null)
+            {
+                BankingDetails = new DetailedBankDetails(individual.BankAccount);
+            }
+            else BankingDetails = new DetailedBankDetails();
+        }
+
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public string Surname { get; set; }
+        public string IdNumber { get; set; }
+        public string CompanyRegNumber { get; set; }
+        public string MaritalStatus { get; set; }
+        public string EmailAddress { get; set; }
+        public string CellNumber { get; set; }
+        public string LandlineNumber { get; set; }
+        public DetailedAddress Address { get; set; }
+        public DetailedBankDetails BankingDetails { get; set; }
+    }
+}

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedWeekDto.cs

@@ -0,0 +1,78 @@
+using System;
+using UnivateProperties_API.Model.Timeshare;
+
+namespace UnivateProperties_API.Containers.Timeshare.Detailed
+{
+    public class DetailedWeekDto
+    {
+        public DetailedWeekDto()
+        {
+
+        }
+
+        public DetailedWeekDto(TimeshareWeek week)
+        {
+            Id = week.Id;
+            ReferedByAgent = week.ReferedByAgent;
+            AgentId = week.AgentId;
+            AgencyId = week.AgencyId;
+            OtherResort = week.OtherResort;
+            OtherResortName = week.OtherResortName;
+            Resort = new ResortDto(week.ResortCode, week.ResortName);
+            ResortCode = week.ResortCode;
+            ResortName = week.ResortName;
+            RegionId = week.RegionId;
+            Season = week.Season;
+            Module = week.Module;
+            UnitNumber = week.UnitNumber;
+            Bedrooms = week.Bedrooms;
+            MaxSleep = week.MaxSleep;
+            WeekNumber = week.WeekNumber;
+            LevyAmount = week.LevyAmount;
+            CurrentYearBanked = week.CurrentYearBanked;
+            BankedWith = week.BankedWith;
+            LeviesPaidInFull = week.LeviesPaidInFull;
+            WeekPlacedForRental = week.WeekPlacedForRental;
+            OriginalPurchaseDate = week.OriginalPurchaseDate.ToShortDateString().Replace('/', '-');
+            OriginalPurchasePrice = week.OriginalPurchasePrice;
+            ArrivalDate = week.ArrivalDate.ToShortDateString().Replace('/', '-');
+            DepartureDate = week.DepartureDate.ToShortDateString().Replace('/', '-');
+            SellPrice = week.SellPrice;
+            AgentCommission = week.AgentCommision;
+            Mandate = week.Mandate;
+            Status = week.Status.Display;
+            Owner = new DetailedOwner(week.Owner);
+        }
+
+        public int Id { get; set; }
+        public bool ReferedByAgent { get; set; }
+        public int? AgentId { get; set; }
+        public int? AgencyId { get; set; }
+        public bool OtherResort { get; set; }
+        public string OtherResortName { get; set; }
+        public ResortDto Resort { get; set; }
+        public string ResortCode { get; set; }
+        public string ResortName { get; set; }
+        public int RegionId { get; set; }
+        public string Season { get; set; }
+        public string Module { get; set; }
+        public string UnitNumber { get; set; }
+        public int Bedrooms { get; set; }
+        public int MaxSleep { get; set; }
+        public string WeekNumber { get; set; }
+        public double LevyAmount { get; set; }
+        public bool CurrentYearBanked { get; set; }
+        public string BankedWith { get; set; }
+        public bool LeviesPaidInFull { get; set; }
+        public bool WeekPlacedForRental { get; set; }
+        public double OriginalPurchasePrice { get; set; }
+        public string OriginalPurchaseDate { get; set; }
+        public string ArrivalDate { get; set; }
+        public string DepartureDate { get; set; }
+        public double SellPrice { get; set; }
+        public double AgentCommission { get; set; }
+        public string Mandate { get; set; }
+        public string Status { get; set; }
+        public DetailedOwner Owner { get; set; }
+    }
+}

UnivateProperties_API/Containers/Timeshare/RegionDto.cs

@@ -3,7 +3,7 @@ using System.Linq;
 
 namespace UnivateProperties_API.Containers.Timeshare
 {
-    public class RegionDto
+    public class RegionDto : IDisplay
     {
         public RegionDto()
         {
@@ -37,6 +37,8 @@ namespace UnivateProperties_API.Containers.Timeshare
             }
         }
 
+        public string Display => RegionName;
+
         public void TryAddResort(string resortCode, string resortName)
         {
             if (!Resorts.Any(x => x.ResortCode == resortCode))

UnivateProperties_API/Containers/Timeshare/ResortDto.cs

@@ -1,6 +1,6 @@
 namespace UnivateProperties_API.Containers.Timeshare
 {
-    public class ResortDto
+    public class ResortDto : IDisplay
     {
         public ResortDto()
         {
@@ -16,5 +16,7 @@
         public string ResortCode { get; set; }
         public string ResortName { get; set; }
         public int Available { get; set; }
+
+        public string Display => ResortName;
     }
 }

UnivateProperties_API/Containers/Timeshare/StatusDto.cs

@@ -1,6 +1,6 @@
 namespace UnivateProperties_API.Containers.Timeshare
 {
-    public class StatusDto
+    public class StatusDto : IDisplay
     {
         public StatusDto()
         {
@@ -17,9 +17,7 @@
         public int Id { get; set; }
         public string Code { get; set; }
         public string Description { get; set; }
-        public override string ToString()
-        {
-            return $"{Code} - {Description}";
-        }
+
+        public string Display => $"{Code} - {Description}";
     }
 }

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

@@ -6,15 +6,16 @@ using UnivateProperties_API.Model.Timeshare;
 
 namespace UnivateProperties_API.Containers.Timeshare
 {
-    public class WeekDto
+    public class WeekDto : IDisplay
     {
         public WeekDto()
         {
 
         }
 
-        public WeekDto(string line)
+        public WeekDto(int id,string line)
         {
+            Id = id;
             List<string> split = line.Split(",").ToList();
             AgentAsRep = false;
             Resort = new ResortDto(split[0].Trim(), split[0].Trim());
@@ -40,7 +41,9 @@ namespace UnivateProperties_API.Containers.Timeshare
             {
                 DepartureDate = tempDate;
             }
-            Region = new RegionDto() { RegionCode = split[24] };
+            Region = new RegionDto() { RegionCode = split[24].Trim() };
+            IsTender = true;
+            ReferedByAgent = false;
         }
 
         public WeekDto(TimeshareWeek week)
@@ -52,7 +55,7 @@ namespace UnivateProperties_API.Containers.Timeshare
             Agent = $"{week.Agent?.Name} {week.Agent?.Surname}";
             Owner = $"{week.Owner?.Name} {week.Owner?.Surname}";
             Resort = new ResortDto(week.ResortCode, week.ResortName);
-            Region = new RegionDto(week.Region != null ? week.Region.Id : 0, week.Region?.Description, week.Region?.Code);
+            Region = new RegionDto(week.Region != null ? week.Region.Id : 0, week.Region?.Code, week.Region?.Description);
             Status = new StatusDto(week.Status.Id, week.Status?.Code, week.Status?.Description);
             Bedrooms = week.Bedrooms;
             MaxSleep = week.MaxSleep;
@@ -63,26 +66,32 @@ namespace UnivateProperties_API.Containers.Timeshare
             ArrivalDate = week.ArrivalDate;
             DepartureDate = week.DepartureDate;
             SellPrice = week.SellPrice;
+            IsTender = false;
+            ReferedByAgent = week.ReferedByAgent;
         }
 
         public int Id { get; set; }
-        public bool AgentAsRep { get; set; }
-        public bool OtherResort { get; set; }
-        public string Agency { get; set; }
-        public string Agent { get; set; }
-        public string Owner { get; set; }
         public ResortDto Resort { get; set; }
         public RegionDto Region { get; set; }
         public StatusDto Status { get; set; }
-        public int Bedrooms { get; set; }
-        public int MaxSleep { get; set; }
         public string UnitNumber { get; set; }
         public string WeekNumber { get; set; }
+        public string Agency { get; set; }
+        public string Agent { get; set; }
+        public string Owner { get; set; }
+        public bool AgentAsRep { get; set; }
+        public bool OtherResort { get; set; }
+        public int Bedrooms { get; set; }
+        public int MaxSleep { get; set; }
         public double LevyAmount { get; set; }
         public bool CurrentYearBanked { get; set; }
         public string BankedWith { get; set; }
         public DateTime ArrivalDate { get; set; }
         public DateTime DepartureDate { get; set; }
         public double SellPrice { get; set; }
+        public bool IsTender { get; set; }
+        public bool ReferedByAgent { get; set; }
+
+        public string Display => $"{Resort.Display}  ({ArrivalDate.ToShortDateString()} - {DepartureDate.ToShortDateString()})";
     }
 }

UnivateProperties_API/Context/DataContext.cs

@@ -169,6 +169,8 @@ namespace UnivateProperties_API.Context
             modelBuilder.Entity<BidItem>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<ProcessFlow>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<Template>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
+
+            
         }
     }
 }

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

@@ -1,7 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Transactions;
 using UnivateProperties_API.Containers.Timeshare;
 using UnivateProperties_API.Model.Timeshare;
@@ -31,7 +28,7 @@ namespace UnivateProperties_API.Controllers.Timeshare
         [HttpGet("{id}")]
         public IActionResult Get(int id)
         {
-            var item = _Repo.Get(x => x.Id == id);
+            var item = (_Repo as WeekRepository).GetMyDetailed(x => x.Id == id);
             return new OkObjectResult(item);
         }
 

UnivateProperties_API/Migrations/20191021143440_MappingBank.cs

@@ -0,0 +1,128 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class MappingBank : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_BankAccounts_Banks_BankId",
+                table: "BankAccounts");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Video",
+                table: "Properties",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "VirtualTour",
+                table: "Properties",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "BankAccountId",
+                table: "Individuals",
+                nullable: true);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "BankId",
+                table: "BankAccounts",
+                nullable: true,
+                oldClrType: typeof(int));
+
+            migrationBuilder.AddColumn<int>(
+                name: "OwnerId",
+                table: "Addresses",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Individuals_BankAccountId",
+                table: "Individuals",
+                column: "BankAccountId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Addresses_OwnerId",
+                table: "Addresses",
+                column: "OwnerId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Addresses_Individuals_OwnerId",
+                table: "Addresses",
+                column: "OwnerId",
+                principalTable: "Individuals",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_BankAccounts_Banks_BankId",
+                table: "BankAccounts",
+                column: "BankId",
+                principalTable: "Banks",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Individuals_BankAccounts_BankAccountId",
+                table: "Individuals",
+                column: "BankAccountId",
+                principalTable: "BankAccounts",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Addresses_Individuals_OwnerId",
+                table: "Addresses");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_BankAccounts_Banks_BankId",
+                table: "BankAccounts");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Individuals_BankAccounts_BankAccountId",
+                table: "Individuals");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Individuals_BankAccountId",
+                table: "Individuals");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Addresses_OwnerId",
+                table: "Addresses");
+
+            migrationBuilder.DropColumn(
+                name: "Video",
+                table: "Properties");
+
+            migrationBuilder.DropColumn(
+                name: "VirtualTour",
+                table: "Properties");
+
+            migrationBuilder.DropColumn(
+                name: "BankAccountId",
+                table: "Individuals");
+
+            migrationBuilder.DropColumn(
+                name: "OwnerId",
+                table: "Addresses");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "BankId",
+                table: "BankAccounts",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_BankAccounts_Banks_BankId",
+                table: "BankAccounts",
+                column: "BankId",
+                principalTable: "Banks",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

UnivateProperties_API/Migrations/20191022055635_AddedWeekProps.cs

@@ -0,0 +1,41 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class AddedWeekProps : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<double>(
+                name: "AgentCommision",
+                table: "Weeks",
+                nullable: false,
+                defaultValue: 0.0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Mandate",
+                table: "Weeks",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "OtherResortName",
+                table: "Weeks",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AgentCommision",
+                table: "Weeks");
+
+            migrationBuilder.DropColumn(
+                name: "Mandate",
+                table: "Weeks");
+
+            migrationBuilder.DropColumn(
+                name: "OtherResortName",
+                table: "Weeks");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -50,7 +50,7 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("AccountNumber");
 
-                    b.Property<int>("BankId");
+                    b.Property<int?>("BankId");
 
                     b.Property<DateTime>("Created");
 
@@ -254,6 +254,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("ModifiedBy");
 
+                    b.Property<int?>("OwnerId");
+
                     b.Property<string>("PostalCode");
 
                     b.Property<string>("Street");
@@ -264,6 +266,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("OwnerId");
+
                     b.ToTable("Addresses");
                 });
 
@@ -412,6 +416,10 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("Unit");
 
+                    b.Property<string>("Video");
+
+                    b.Property<string>("VirtualTour");
+
                     b.HasKey("Id");
 
                     b.HasIndex("AgencyId");
@@ -690,6 +698,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<bool>("AgentAsRep");
 
+                    b.Property<double>("AgentCommision");
+
                     b.Property<int?>("AgentId");
 
                     b.Property<DateTime>("ArrivalDate");
@@ -710,6 +720,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<double>("LevyAmount");
 
+                    b.Property<string>("Mandate");
+
                     b.Property<int>("MaxSleep");
 
                     b.Property<DateTime>("Modified");
@@ -724,6 +736,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<bool>("OtherResort");
 
+                    b.Property<string>("OtherResortName");
+
                     b.Property<int>("OwnerId");
 
                     b.Property<bool>("ReferedByAgent");
@@ -881,6 +895,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<int?>("AddressId");
 
+                    b.Property<int?>("BankAccountId");
+
                     b.Property<string>("CellNumber");
 
                     b.Property<string>("CompanyRegNumber");
@@ -913,6 +929,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.HasIndex("AddressId");
 
+                    b.HasIndex("BankAccountId");
+
                     b.HasIndex("UserId");
 
                     b.HasIndex("Telephone", "CellNumber", "Email")
@@ -990,8 +1008,7 @@ namespace UnivateProperties_API.Migrations
                 {
                     b.HasOne("UnivateProperties_API.Model.Banks.Bank", "Bank")
                         .WithMany()
-                        .HasForeignKey("BankId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .HasForeignKey("BankId");
 
                     b.HasOne("UnivateProperties_API.Model.Users.Individual", "Owner")
                         .WithMany()
@@ -1022,6 +1039,13 @@ namespace UnivateProperties_API.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
+            modelBuilder.Entity("UnivateProperties_API.Model.Misc.Address", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Users.Individual", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId");
+                });
+
             modelBuilder.Entity("UnivateProperties_API.Model.ProcessFlow.BidItem", b =>
                 {
                     b.HasOne("UnivateProperties_API.Model.Users.Individual", "BidMaker")
@@ -1192,6 +1216,10 @@ namespace UnivateProperties_API.Migrations
                         .WithMany()
                         .HasForeignKey("AddressId");
 
+                    b.HasOne("UnivateProperties_API.Model.Banks.BankAccount", "BankAccount")
+                        .WithMany()
+                        .HasForeignKey("BankAccountId");
+
                     b.HasOne("UnivateProperties_API.Model.Users.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId");

UnivateProperties_API/Model/Banks/BankAccount.cs

@@ -1,4 +1,5 @@
-using UnivateProperties_API.Model.Users;
+using System.ComponentModel.DataAnnotations.Schema;
+using UnivateProperties_API.Model.Users;
 
 namespace UnivateProperties_API.Model.Banks
 {
@@ -7,7 +8,9 @@ namespace UnivateProperties_API.Model.Banks
         #region Properties
         public string AccountHolder { get; set; }
         public string AccountNumber { get; set; }
-        public int BankId { get; set; }
+        [ForeignKey("Bank")]
+        public int? BankId { get; set; }
+        [ForeignKey("Owner")]
         public int? OwnerId { get; set; }
         #endregion Properties
 

UnivateProperties_API/Model/BaseEntity.cs

@@ -7,7 +7,7 @@ using UnivateProperties_API.Containers;
 
 namespace UnivateProperties_API.Model
 {
-    public class BaseEntity
+    public class BaseEntity : IDisplay
     {
         #region Properties
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -19,6 +19,8 @@ namespace UnivateProperties_API.Model
         [NotMapped]
         public ValidateEntity Valid { get; set; }
         public bool IsDeleted { get; set; } = false;
+        [NotMapped]
+        public virtual string Display { get { return ToString(); } }
         #endregion
 
         #region Methods

UnivateProperties_API/Model/Misc/Address.cs

@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations.Schema;
+using UnivateProperties_API.Model.Users;
 
 namespace UnivateProperties_API.Model.Misc
 {
@@ -12,5 +10,9 @@ namespace UnivateProperties_API.Model.Misc
         public string Suburb { get; set; }
         public string City { get; set; }
         public string PostalCode { get; set; }
+        [ForeignKey("Owner")]
+        public int? OwnerId { get; set; }
+
+        public virtual Individual Owner { get; set; }
     }
 }

UnivateProperties_API/Model/ProcessFlow/ProcessFlow.cs

@@ -1,11 +1,15 @@
-using UnivateProperties_API.Model.Timeshare;
+using System.ComponentModel.DataAnnotations.Schema;
+using UnivateProperties_API.Model.Timeshare;
 
 namespace UnivateProperties_API.Model.ProcessFlow
 {
     public class ProcessFlow : BaseEntity
     {
+        [ForeignKey("Timeshare")]
         public int? TimeshareID { get; set; }
+        [ForeignKey("Property")]
         public int? PropertyID { get; set; }
+        [ForeignKey("Status")]
         public int StatusID { get; set; }
 
 

UnivateProperties_API/Model/Timeshare/Status.cs

@@ -5,5 +5,6 @@
         public string Code { get; set; }
         public string Description { get; set; }
         public StatusType StatusType { get; set; }
+        public override string Display => $"{Description} ({Code})";
     }
 }

UnivateProperties_API/Model/Timeshare/TimeshareWeek.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using UnivateProperties_API.Containers.Timeshare;
 using UnivateProperties_API.Model.ProcessFlow;
 using UnivateProperties_API.Model.Region;
 using UnivateProperties_API.Model.Users;
@@ -9,6 +10,23 @@ namespace UnivateProperties_API.Model.Timeshare
 {
     public class TimeshareWeek : BaseEntity
     {
+        TimeshareWeek()
+        {
+
+        }
+
+        TimeshareWeek(WeekDto week)
+        {
+            ReferedByAgent = week.ReferedByAgent;
+            AgentAsRep = false;
+            ResortCode = week.Resort.ResortCode;
+            ResortName = week.Resort.ResortName;
+            RegionId = week.Region.Id;
+            Bedrooms = week.Bedrooms;
+            MaxSleep = week.MaxSleep;
+            UnitNumber = week.UnitNumber;
+        }
+
         #region Properties
         public bool ReferedByAgent { get; set; }
         [ForeignKey("Agent")]
@@ -20,6 +38,7 @@ namespace UnivateProperties_API.Model.Timeshare
 
         public bool AgentAsRep { get; set; }
         public bool OtherResort { get; set; }
+        public string OtherResortName { get; set; }
         public string ResortCode { get; set; }
         public string ResortName { get; set; }
         [ForeignKey("Region")]
@@ -43,6 +62,8 @@ namespace UnivateProperties_API.Model.Timeshare
         public DateTime DepartureDate { get; set; }
         
         public double SellPrice { get; set; }
+        public double AgentCommision { get; set; }
+        public string Mandate { get; set; }
 
         [ForeignKey("Status")]
         public int StatusId { get; set; }

UnivateProperties_API/Model/Users/Individual.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using UnivateProperties_API.Model.Banks;
 using UnivateProperties_API.Model.Misc;
 using UnivateProperties_API.Model.Properties;
 
@@ -19,10 +20,14 @@ namespace UnivateProperties_API.Model.Users
         public string IdNumber { get; set; }
         public string CompanyRegNumber { get; set; }
         public string MaritalStatus { get; set; }
+        [ForeignKey("Address")]
         public int? AddressId { get; set; }
         public string IncomeTaxNumber { get; set; }
-        public virtual Address Address { get; set; }
+        [ForeignKey("BankAccount")]
+        public int? BankAccountId { get; set; }
 
+        public virtual Address Address { get; set; }
+        public virtual BankAccount BankAccount { get; set; }
         public virtual ICollection<Property> Properties { get; set; }
         #endregion Properties
     }

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using UnivateProperties_API.Containers.Timeshare;
+using UnivateProperties_API.Containers.Timeshare.Detailed;
 using UnivateProperties_API.Containers.Users;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Helpers;
@@ -43,6 +44,16 @@ namespace UnivateProperties_API.Repository.Timeshare
             return item;
         }
 
+        public DetailedWeekDto GetMyDetailed(Func<TimeshareWeek, bool> first)
+        {
+            var item = GetDetailed(first);
+            if(item != null)
+            {
+                return new DetailedWeekDto(item);
+            }
+            return null;
+        }
+
         public List<WeekDto> GetDtoListAll()
         {
             List<WeekDto> list = new List<WeekDto>();
@@ -71,24 +82,36 @@ namespace UnivateProperties_API.Repository.Timeshare
             }
             else if (user.IsUserInRole(Role.Agency))
             {
-                foreach (var item in GetDetailedAll().Where(x => x.AgencyId == userId))
+                var agent = _dbContext.Agents.FirstOrDefault(x => x.UserId == userId);
+                if(agent != null)
                 {
-                    list.Add(new WeekDto(item));
-                }
+                    foreach (var item in GetDetailedAll().Where(x => x.AgencyId == agent.AgencyId))
+                    {
+                        list.Add(new WeekDto(item));
+                    }
+                }                
             }
             else if (user.IsUserInRole(Role.Agent) || user.IsUserInRole(Role.ManagingAgent))
             {
-                foreach (var item in GetDetailedAll().Where(x => x.AgentId == userId))
+                var agent = _dbContext.Agents.FirstOrDefault(x => x.UserId == userId);
+                if(agent != null)
                 {
-                    list.Add(new WeekDto(item));
+                    foreach (var item in GetDetailedAll().Where(x => x.AgentId == agent.Id))
+                    {
+                        list.Add(new WeekDto(item));
+                    }
                 }
             }
             else
             {
-                foreach (var item in GetDetailedAll().Where(x => x.OwnerId == userId))
+                var individual = _dbContext.Individuals.FirstOrDefault(x => x.UserId == userId);
+                if(individual != null)
                 {
-                    list.Add(new WeekDto(item));
-                }
+                    foreach (var item in GetDetailedAll().Where(x => x.OwnerId == userId))
+                    {
+                        list.Add(new WeekDto(item));
+                    }
+                }                
             }
             return list;
         }
@@ -96,18 +119,18 @@ namespace UnivateProperties_API.Repository.Timeshare
         public List<RegionDto> GetAvailResort()
         {
             List<RegionDto> list = new List<RegionDto>();
-            var allItems = GetDetailedAll();
+            var allItems = GetDtoListAll();
             foreach (var item in allItems)
             {
                 if (item.Region != null)
                 {
-                    if (!list.Any(x => x.RegionCode == item.Region.Code))
+                    if (!list.Any(x => x.RegionCode == item.Region.RegionCode))
                     {
-                        list.Add(new RegionDto(item.Region.Code, item.Region.Description));
+                        list.Add(new RegionDto(item.Region.RegionCode, item.Region.RegionName));
                     }
-                    foreach (var i in list.Where(x => x.RegionCode == item.Region.Code))
+                    foreach (var i in list.Where(x => x.RegionCode == item.Region.RegionCode))
                     {
-                        i.TryAddResort(item.ResortCode, item.ResortName);
+                        i.TryAddResort(item.Resort.ResortCode, item.Resort.ResortName);
                     }
                 }
             }
@@ -117,7 +140,7 @@ namespace UnivateProperties_API.Repository.Timeshare
                 region.OrderResorts();
                 foreach (var resort in region.Resorts)
                 {
-                    resort.Available = allItems.Count(x => x.ResortCode == resort.ResortCode);
+                    resort.Available = allItems.Count(x => x.Resort.ResortCode == resort.ResortCode);
                 }
             }
             return list;
@@ -192,7 +215,13 @@ namespace UnivateProperties_API.Repository.Timeshare
                 };
             }
             item.Id = NewId();
+            UnivateProperties_API.Model.ProcessFlow.ProcessFlow flowItem = new Model.ProcessFlow.ProcessFlow()
+            {
+                Status = item.Status,
+                Timeshare = item
+            };
             _dbContext.Add(item);
+            _dbContext.Add(flowItem);
             Save();
         }
 
@@ -282,6 +311,12 @@ namespace UnivateProperties_API.Repository.Timeshare
             return id;
         }
 
+        private int _TenderId = 10000;
+        private int GetTenderId()
+        {
+            return _TenderId++;
+        }
+
         private List<WeekDto> GetTenderWeeks()
         {
             List<WeekDto> list = new List<WeekDto>();
@@ -299,8 +334,10 @@ namespace UnivateProperties_API.Repository.Timeshare
                     foreach (string line in lines)
                     {
                         cleanLine = line.Replace("<br>", "");
-                        cleanLine = line.Replace("<br/>", "");
-                        list.Add(new WeekDto(cleanLine));
+                        cleanLine = cleanLine.Replace("<br >", "");
+                        cleanLine = cleanLine.Replace("<br/>", "");
+                        cleanLine = cleanLine.Replace("<br />", "");
+                        list.Add(new WeekDto(GetTenderId(),cleanLine));
                     }
                 }
             }
@@ -320,7 +357,10 @@ namespace UnivateProperties_API.Repository.Timeshare
             foreach(var item in list)
             {
                 prov = province.GetDetailed(x => x.Code == item.Region.RegionCode);
-                item.Region = new RegionDto(prov.Id, prov.Code, prov.Description);
+                if(prov != null)
+                {
+                    item.Region = new RegionDto(prov.Id, prov.Code, prov.Description);
+                }                
             }
             return list;
         }
@@ -331,6 +371,8 @@ namespace UnivateProperties_API.Repository.Timeshare
             {
                 case "FN":
                     return "KZN";
+                case "L":
+                    return "LI";
                 default:
                     return value;
             }