UnivateProperties_API/Migrations/20200915123751_timeshareNewCols.cs

@@ -0,0 +1,43 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class timeshareNewCols : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Publish",
+                table: "Weeks",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "PulbishedDate",
+                table: "Weeks",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<string>(
+                name: "WeekStatus",
+                table: "Weeks",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Publish",
+                table: "Weeks");
+
+            migrationBuilder.DropColumn(
+                name: "PulbishedDate",
+                table: "Weeks");
+
+            migrationBuilder.DropColumn(
+                name: "WeekStatus",
+                table: "Weeks");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -1055,6 +1055,10 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<int>("OwnerId");
 
+                    b.Property<bool>("Publish");
+
+                    b.Property<DateTime>("PulbishedDate");
+
                     b.Property<bool>("ReferedByAgent");
 
                     b.Property<int>("RegionId");
@@ -1075,6 +1079,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<bool>("WeekPlacedForRental");
 
+                    b.Property<string>("WeekStatus");
+
                     b.Property<int>("WeekType");
 
                     b.HasKey("Id");

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, bool 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, string weekStatus, DateTime datePublished, bool published)
         {
             ReferedByAgent = referedByAgent;
             AgentId = agentId;
@@ -52,6 +52,9 @@ namespace UnivateProperties_API.Model.Timeshare
             Agency = agency;
             BidItems = bidItems;
             ProcessFlows = processFlows;
+            WeekStatus = weekStatus;
+            Publish = published;
+            PulbishedDate = datePublished;
         }
 
         #region Properties
@@ -97,6 +100,9 @@ namespace UnivateProperties_API.Model.Timeshare
         public int StatusId { get; set; }
 
         public WeekType WeekType { get; set; }
+        public string WeekStatus { get; set; }
+        public bool Publish { get; set; }
+        public DateTime PulbishedDate { get; set; }
         #endregion
 
         #region Navigation

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -223,7 +223,7 @@ namespace UnivateProperties_API.Repository.Timeshare
                 };
                 repo.Insert(stat);
             }
-            item.Id = NewId();
+            //item.Id = NewId();
             item.ProcessFlows.Add(new Model.ProcessFlow.ProcessFlow()
             {
                 Status = item.Status,
@@ -249,12 +249,12 @@ namespace UnivateProperties_API.Repository.Timeshare
 
         public void Insert(IEnumerable<TimeshareWeek> items)
         {
-            int id = NewId();
+            //int id = NewId();
             foreach (var item in items)
             {
-                item.Id = id;
+                //item.Id = id;
                 _dbContext.Add(item);
-                id += 1;
+                //id += 1;
             }
             Save();
         }
@@ -294,10 +294,9 @@ namespace UnivateProperties_API.Repository.Timeshare
             if (saved.Mandate != item.Mandate)
             {
                 if (item.Mandate)
-                    item.DateMandated = DateTime.Now;
+                    saved.DateMandated = DateTime.Now;
             }
-
-            _dbContext.Entry(item).State = EntityState.Modified;
+            _dbContext.Entry(saved).State = EntityState.Modified;
             Save();
         }
 
@@ -329,16 +328,16 @@ namespace UnivateProperties_API.Repository.Timeshare
             return item;
         }
 
-        public int NewId()
-        {
-            int id = 0;
-            if (_dbContext.Weeks.Count() > 0)
-            {
-                id = _dbContext.Weeks.Max(x => x.Id);
-            }
-            id += 1;
-            return id;
-        }
+        //public int NewId()
+        //{
+        //    int id = 0;
+        //    if (_dbContext.Weeks.Count() > 0)
+        //    {
+        //        id = _dbContext.Weeks.Max(x => x.Id);
+        //    }
+        //    id += 1;
+        //    return id;
+        //}
 
         private int _TenderId = 10000;
         private int GetTenderId()