Updated Design User

UnivateProperties_API/Containers/Users/Role.cs

@@ -13,5 +13,6 @@ namespace UnivateProperties_API.Containers.Users
         public const string Agent = "Agent";
         public const string ManagingAgent = "Managing Agent";
         public const string Developer = "Developer";
+        public const string Designer = "Designer";
     }
 }

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -227,6 +227,17 @@ namespace UnivateProperties_API.Repository.Timeshare
                         }
                     }
                 }
+                else if (user.IsUserInRole(Role.Designer) || user.IsUserInRole(Role.ManagingAgent))
+                {
+                    var _user = _dbContext.Individuals.FirstOrDefault(x => x.UserId == userId);
+                    if (_user != null)
+                    {
+                        foreach (var item in GetDetailedAll())
+                        {
+                            list.Add(new WeekDto(item));
+                        }
+                    }
+                }
                 else
                 {
                     var individual = _dbContext.Individuals.FirstOrDefault(x => x.UserId == userId);
@@ -839,19 +850,24 @@ namespace UnivateProperties_API.Repository.Timeshare
 
         public int SaveNewWeek(TimeshareWeekDto sellItem)
         {
+            
+
+            //var banking = _dbContext.BankAccounts.Where(b => b.Id == sellItem.OwnerObject.BankingDetails.Id).FirstOrDefault();
+            var status = _dbContext.Status.Where(s => s.Id == sellItem.StatusId && s.StatusType == StatusType.Timeshare).FirstOrDefault();
+
+            if (sellItem.AgentId != null)
+            {
+                var agent = _dbContext.Agents.Where(ag => ag.Id == sellItem.AgentId).FirstOrDefault();
+            }
+
 
-            var owner = _dbContext.Individuals.Where(x => x.UserId == sellItem.OwnerId).FirstOrDefault();
+            #region Address - Check if the user has an address, if not and a new address has been posted it can be updated
             var address = new Model.Misc.Address();
-            if (sellItem.OwnerObject.Address != null) 
+            if (sellItem.OwnerObject.Address != null)
             {
                 address = _dbContext.Addresses.Where(a => a.Id == sellItem.OwnerObject.Address.Id).FirstOrDefault();
             }
-            
-            var banking = _dbContext.BankAccounts.Where(b => b.Id == sellItem.OwnerObject.BankingDetails.Id).FirstOrDefault();
-            var status = _dbContext.Status.Where(s => s.Code == "A1" && s.StatusType == StatusType.Timeshare).FirstOrDefault();
-            var agent = _dbContext.Agents.Where(ag => ag.Id == sellItem.AgentId).FirstOrDefault();
-            
-            #region Address
+
             if (sellItem.OwnerObject.Address.PostalCode != "")
             {
                 if (address == null)
@@ -878,116 +894,205 @@ namespace UnivateProperties_API.Repository.Timeshare
             }
             #endregion
 
-            #region Banking
-            if (sellItem.OwnerObject.BankingDetails.AccountHolder != "")
-            {
-                if (banking == null)
-                {
-                    banking = new Model.Banks.BankAccount();
-                }
-                banking.AccountHolder = sellItem.OwnerObject.BankingDetails.AccountHolder;
-                banking.AccountNumber = sellItem.OwnerObject.BankingDetails.AccountNumber;
-                banking.BankId = sellItem.OwnerObject.BankingDetails.Bank.Id;
 
-                if (banking.Id == 0)
-                {
-                    _dbContext.Add(banking);
-                    Save();
-                }
-                else
-                {
-                    _dbContext.Entry(banking).State = EntityState.Modified;
-                    Save();
-                }
-            }
-            #endregion
+
+            //#region Banking
+            //if (sellItem.OwnerObject.BankingDetails.AccountHolder != "")
+            //{
+            //    if (banking == null)
+            //    {
+            //        banking = new Model.Banks.BankAccount();
+            //    }
+            //    banking.AccountHolder = sellItem.OwnerObject.BankingDetails.AccountHolder;
+            //    banking.AccountNumber = sellItem.OwnerObject.BankingDetails.AccountNumber;
+            //    banking.BankId = sellItem.OwnerObject.BankingDetails.Bank.Id;
+
+            //    if (banking.Id == 0)
+            //    {
+            //        _dbContext.Add(banking);
+            //        Save();
+            //    }
+            //    else
+            //    {
+            //        _dbContext.Entry(banking).State = EntityState.Modified;
+            //        Save();
+            //    }
+            //}
+            //#endregion
 
             #region Owner
-            if (!sellItem.CustomOwner)
+            //Check if an agent has listed the week.
+            var agentWeek = _dbContext.Agents.Where(x => x.UserId == sellItem.OwnerId && !x.IsDeleted).FirstOrDefault();
+            var owner = new Model.Users.Individual();
+            var indiv = new NonRegIndividual();
+
+            //Check if agentWeek is null. If null get an owner that listed the week
+            if (agentWeek == null)
             {
-                if (owner == null)
-                {                    
-                    owner = new Model.Users.Individual();
-                }
-                if (address != null)
-                {
-                    owner.AddressId = address.Id;
-                    owner.Address = address;
-                }
-                if (banking != null)
+                owner = _dbContext.Individuals.Where(x => x.UserId == sellItem.OwnerId).FirstOrDefault();
+            }
+
+            if (sellItem.CustomOwner)
+            {
+                sellItem.DisplayOwner = sellItem.OwnerObject.Name + " " + sellItem.OwnerObject.Surname;
+                indiv = new NonRegIndividual()
                 {
-                    owner.BankAccount = banking;
-                    owner.BankAccountId = banking.Id;
-                }
-                owner.Name = sellItem.OwnerObject.Name;
-                owner.Surname = sellItem.OwnerObject.Surname;
-                owner.IdNumber = sellItem.OwnerObject.IdNumber;
-                owner.CompanyRegNumber = sellItem.OwnerObject.CompanyRegNumber;
-                owner.Email = sellItem.OwnerObject.EmailAddress;
-                owner.CellNumber = sellItem.OwnerObject.CellNumber;
-                owner.Telephone = sellItem.OwnerObject.LandlineNumber;
-                sellItem.DisplayOwner = owner.Name + " " + owner.Surname;
+                    Name = sellItem.OwnerObject.Name,
+                    Surname = sellItem.OwnerObject.Surname,
+                    IDNumber = sellItem.OwnerObject.IdNumber,
+                    CompanyRegNumber = sellItem.OwnerObject.CompanyRegNumber,
+                    EmailAddress = sellItem.OwnerObject.EmailAddress,
+                    CellNumber = sellItem.OwnerObject.CellNumber,
+                    TelephoneNumber = sellItem.OwnerObject.LandlineNumber,
+                    SpouseCellnumber = sellItem.OwnerObject.SpouseCellnumber,
+                    SpouseEmail = sellItem.OwnerObject.SpouseEmail,
+                    SpouseName = sellItem.OwnerObject.SpouseName,
+                    SpouseSurname = sellItem.OwnerObject.SpouseSurname,
+                    SpouseTelephone = sellItem.OwnerObject.SpouseSurname,                    
+                };
 
                 switch (sellItem.OwnerObject.MaritalStatus?.ToUpper())
                 {
+                    case "":
+                        indiv.HowMarried = MarriedType.NotApplicable;
+                        break;
                     case "N/A":
-                        owner.HowMarried = MarriedType.NotApplicable;
+                        indiv.HowMarried = MarriedType.NotApplicable;
                         break;
                     case "IN COMMUNITY OF PROPERTY":
-                        owner.HowMarried = MarriedType.ICOP;
+                        indiv.HowMarried = MarriedType.ICOP;
                         break;
                     case "OUT OF COMMUNITY OF PROPERTY":
-                        owner.HowMarried = MarriedType.OCOP;
+                        indiv.HowMarried = MarriedType.OCOP;
                         break;
                     case "OTHER":
-                        owner.HowMarried = MarriedType.Other;
+                        indiv.HowMarried = MarriedType.Other;
                         break;
                     case "TRADITIONAL WEDDING":
-                        owner.HowMarried = MarriedType.Traditional;
+                        indiv.HowMarried = MarriedType.Traditional;
                         break;
                     case "SINGLE":
-                        owner.HowMarried = MarriedType.Single;
+                        indiv.HowMarried = MarriedType.Single;
                         break;
                     case "DIVORCED":
-                        owner.HowMarried = MarriedType.Divorced;
+                        indiv.HowMarried = MarriedType.Divorced;
                         break;
                     case "WIDOW":
-                        owner.HowMarried = MarriedType.Widow;
+                        indiv.HowMarried = MarriedType.Widow;
                         break;
                     case "COMMITTED RELATIONSHIP":
-                        owner.HowMarried = MarriedType.CommittedRelationship;
+                        indiv.HowMarried = MarriedType.CommittedRelationship;
                         break;
                     case "PARTNER":
-                        owner.HowMarried = MarriedType.Partner;
+                        indiv.HowMarried = MarriedType.Partner;
                         break;
                     default:
-                        owner.HowMarried = MarriedType.NotApplicable;
+                        indiv.HowMarried = MarriedType.NotApplicable;
                         break;
                 }
+                _dbContext.NonRegIndividuals.Add(indiv);
+                _dbContext.SaveChanges();
+            }
+            else
+            {
+                if (owner == null)
+                {
+                    owner = new Model.Users.Individual();
+                }
 
-                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 (address != null)
+                {
+                    owner.AddressId = address.Id;
+                    owner.Address = address;
+                }
 
-                if (owner.Id == 0)
+                if (agentWeek == null)
                 {
-                    _dbContext.Add(owner);
-                    Save();
+                    owner.Name = sellItem.OwnerObject.Name;
+                    owner.Surname = sellItem.OwnerObject.Surname;
+                    owner.IdNumber = sellItem.OwnerObject.IdNumber;
+                    owner.CompanyRegNumber = sellItem.OwnerObject.CompanyRegNumber;
+                    owner.Email = sellItem.OwnerObject.EmailAddress;
+                    owner.CellNumber = sellItem.OwnerObject.CellNumber;
+                    owner.Telephone = sellItem.OwnerObject.LandlineNumber;
+                    sellItem.DisplayOwner = owner.Name + " " + owner.Surname;
+
+                    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);
+                        Save();
+                    }
+                    else
+                    {
+                        _dbContext.Entry(owner).State = EntityState.Modified;
+                        Save();
+                    }
                 }
                 else
                 {
-                    _dbContext.Entry(owner).State = EntityState.Modified;
-                    Save();
+                    agentWeek.Name = sellItem.OwnerObject.Name;
+                    agentWeek.Surname = sellItem.OwnerObject.Surname;                    
+                    agentWeek.Email = sellItem.OwnerObject.EmailAddress;
+                    agentWeek.CellNumber = sellItem.OwnerObject.CellNumber;
+                    agentWeek.Telephone = sellItem.OwnerObject.LandlineNumber;
+                    sellItem.DisplayOwner = agentWeek.Name + " " + agentWeek.Surname;                  
+
+                    if (agentWeek.Id == 0)
+                    {
+                        _dbContext.Add(agentWeek);
+                        Save();
+                    }
+                    else
+                    {
+                        _dbContext.Entry(agentWeek).State = EntityState.Modified;
+                        Save();
+                    }
                 }
             }
-            else 
-            {
-                sellItem.DisplayOwner = sellItem.OwnerObject.Name + " " + sellItem.OwnerObject.Surname;
-            }
-            
-            #endregion
+            #endregion           
 
             var week = new TimeshareWeek();
             foreach (string prop in week.GetAllProperties())
@@ -995,15 +1100,19 @@ namespace UnivateProperties_API.Repository.Timeshare
                 if (prop != "Item" && prop != "Display")
                     week[prop] = sellItem[prop];
             }
-            week.Region = null;            
-            week.RegionId = sellItem.Region.Id;                        
+            week.Region = null;
+            week.RegionId = sellItem.Region.Id;
 
-            if (owner != null) 
+            //if agentWeek then set week owner equal to agentWeek.id else
+            if (agentWeek != null)
+            {
+                week.OwnerId = agentWeek.Id;
+            }
+            else
             {
                 week.OwnerId = owner.Id;
             }
-            
-            
+
             if (week.Mandate)
                 week.DateMandated = DateTime.Now;
 
@@ -1013,7 +1122,7 @@ namespace UnivateProperties_API.Repository.Timeshare
 
             try
             {
-                if (agent != null)
+                if (agentWeek != null)
                 {
                     template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-Agent");
                     if (template != null)
@@ -1037,13 +1146,11 @@ namespace UnivateProperties_API.Repository.Timeshare
 
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 throw (ex);
             }
 
-
-
             if (sellItem.StatusId == 0)
             {
                 var statuses = _dbContext.Status.ToList();
@@ -1054,69 +1161,13 @@ namespace UnivateProperties_API.Repository.Timeshare
                         week.StatusId = statusItem.Id;
                     }
                 }
-            }            
+            }
+
             _dbContext.Add(week);
             Save();
             if (sellItem.CustomOwner)
             {
-                var indiv = new NonRegIndividual()
-                {
-                    Name = sellItem.OwnerObject.Name,
-                    Surname = sellItem.OwnerObject.Surname,
-                    IDNumber = sellItem.OwnerObject.IdNumber,
-                    CompanyRegNumber = sellItem.OwnerObject.CompanyRegNumber,
-                    EmailAddress = sellItem.OwnerObject.EmailAddress,
-                    CellNumber = sellItem.OwnerObject.CellNumber,
-                    TelephoneNumber = sellItem.OwnerObject.LandlineNumber,
-                    SpouseCellnumber = sellItem.OwnerObject.SpouseCellnumber,
-                    SpouseEmail = sellItem.OwnerObject.SpouseEmail,
-                    SpouseName = sellItem.OwnerObject.SpouseName,
-                    SpouseSurname = sellItem.OwnerObject.SpouseSurname,
-                    SpouseTelephone = sellItem.OwnerObject.SpouseSurname,
-                    WeekId = week.Id
-                };
-
-                switch (sellItem.OwnerObject.MaritalStatus?.ToUpper())
-                {
-                    case "":
-                        indiv.HowMarried = MarriedType.NotApplicable;
-                        break;
-                    case "N/A":
-                        indiv.HowMarried = MarriedType.NotApplicable;
-                        break;
-                    case "IN COMMUNITY OF PROPERTY":
-                        indiv.HowMarried = MarriedType.ICOP;
-                        break;
-                    case "OUT OF COMMUNITY OF PROPERTY":
-                        indiv.HowMarried = MarriedType.OCOP;
-                        break;
-                    case "OTHER":
-                        indiv.HowMarried = MarriedType.Other;
-                        break;
-                    case "TRADITIONAL WEDDING":
-                        indiv.HowMarried = MarriedType.Traditional;
-                        break;
-                    case "SINGLE":
-                        indiv.HowMarried = MarriedType.Single;
-                        break;
-                    case "DIVORCED":
-                        indiv.HowMarried = MarriedType.Divorced;
-                        break;
-                    case "WIDOW":
-                        indiv.HowMarried = MarriedType.Widow;
-                        break;
-                    case "COMMITTED RELATIONSHIP":
-                        indiv.HowMarried = MarriedType.CommittedRelationship;
-                        break;
-                    case "PARTNER":
-                        indiv.HowMarried = MarriedType.Partner;
-                        break;
-                    default:
-                        indiv.HowMarried = MarriedType.NotApplicable;
-                        break;
-                }
-                _dbContext.NonRegIndividuals.Add(indiv);
-                _dbContext.SaveChanges();
+                indiv.WeekId = week.Id;
             }
             return week.Id;
         }

UnivateProperties_API/Repository/Users/RegisterRepository.cs

@@ -430,8 +430,8 @@ namespace UnivateProperties_API.Repository.Users
 
                 //change below to test locally or QA
                 //string url = "http://localhost:8080/#/forgotPasswordReset/" + linkStr;
-                string url = "http://training.provision-sa.com:122/#/forgotPasswordReset/" + linkStr;
-                //string url = "https://www.pvsl.co.za:97/#/forgotPasswordReset/" + linkStr;
+                //string url = "http://training.provision-sa.com:122/#/forgotPasswordReset/" + linkStr;
+                string url = "https://www.pvsl.co.za:97/#/forgotPasswordReset/" + linkStr;
                 //string url = "https://www.univateproperties.co.za/#/forgotPasswordReset/" + linkStr;
 
                 mailer.ForgotPassword(indiv, url);

UnivateProperties_API/appsettings.json

@@ -9,7 +9,8 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVate;Persist Security Info=True;User Id=Provision;Password=J%Xvk8xGeT;Pooling=false;",
+    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=Provision;Password=What123!;Pooling=false;",
+    //"DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=Provision;Password=J%Xvk8xGeT;Pooling=false;",
     "TenderConnection": "http://www.unipoint-consoft.co.za/nph-srep.exe?cluvavail.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N",
     "ReservationsURL": "https://www.pvsl.co.za:85/ReservationsWebService.asmx", //Please note that ReservationsWebService must be in this case. 
     "ReservationsUserCode": "UniInt",