Template and attributes

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Timeshare;
 
 namespace UnivateProperties_API.Containers.Timeshare
@@ -10,6 +13,36 @@ namespace UnivateProperties_API.Containers.Timeshare
 
         }
 
+        public WeekDto(string line)
+        {
+            List<string> split = line.Split(",").ToList();
+            AgentAsRep = false;
+            Resort = new ResortDto(split[0].Trim(), split[0].Trim());
+            UnitNumber = split[1].Trim();
+            WeekNumber = split[2].Trim();
+            var size = split[3].Trim();
+            if(size.Length == 3 && !size.ToLower().StartsWith('s'))
+            {
+                int.TryParse(size.Substring(0, 1), out int temp);
+                Bedrooms = temp;
+                int.TryParse(size.Substring(2, 1), out temp);
+                MaxSleep = temp;
+            }
+            bool currentYear = split[9].Trim() == "Y";
+            LevyAmount = Convert.ToDouble(split[5].Trim());
+            DateTime tempDate = MyCommon.GetDateFromString(currentYear ? split[6].Trim() : split[13].Trim());
+            if(tempDate != DateTime.MinValue)
+            {
+                ArrivalDate = tempDate;
+            }
+            tempDate = MyCommon.GetDateFromString(currentYear ? split[7].Trim() : split[14].Trim());
+            if(tempDate != DateTime.MinValue)
+            {
+                DepartureDate = tempDate;
+            }
+            Region = new RegionDto() { RegionCode = split[24] };
+        }
+
         public WeekDto(TimeshareWeek week)
         {
             Id = week.Id;

UnivateProperties_API/Context/DataContext.cs

@@ -110,6 +110,8 @@ namespace UnivateProperties_API.Context
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
+            modelBuilder.Entity<Individual>()
+                .Ignore(b => b.FullName);
             modelBuilder.Entity<SMTPHost>().ToTable("Hosts");
             modelBuilder.Entity<UnitConfiguration>()
                 .HasIndex(u => u.Code)

UnivateProperties_API/Helpers/Attributes/BaseAttribute.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace UnivateProperties_API.Helpers.Attributes
+{
+    public abstract class BaseAttribute : Attribute
+    {
+        protected BaseAttribute() { }
+
+        public abstract object Value { get; }
+    }
+}

UnivateProperties_API/Helpers/Attributes/VisibleAttribute.cs

@@ -0,0 +1,17 @@
+namespace UnivateProperties_API.Helpers.Attributes
+{
+    public class VisibleAttribute : BaseAttribute
+    {
+        public VisibleAttribute(bool value)
+        {
+            Value = value;
+        }
+
+        public VisibleAttribute()
+        {
+            Value = true;
+        }
+
+        public override object Value { get; }
+    }
+}

UnivateProperties_API/Helpers/Attributes/VisibleInListViewAttribute.cs

@@ -0,0 +1,16 @@
+namespace UnivateProperties_API.Helpers.Attributes
+{
+    public class VisibleInListViewAttribute : VisibleAttribute
+    {
+        public VisibleInListViewAttribute(bool value) : base(value)
+        {
+        }
+
+        public VisibleInListViewAttribute() : base()
+        {
+
+        }
+
+        public override object Value => base.Value;
+    }
+}

UnivateProperties_API/Helpers/MyCommon.cs

@@ -1,10 +1,58 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
+using UnivateProperties_API.Helpers.Attributes;
 
 namespace UnivateProperties_API.Helpers
 {
     public static class MyCommon
     {
+        public static List<string> GetVisibleColumns<T>(T item) where T : new()
+        {
+            List<string> list = new List<string>();
+            var type = item.GetType();
+            var properties = type.GetProperties();
+            var visibleProperties = properties.Where(x => x.GetCustomAttributes(false).Any(a => a.GetType() == typeof(VisibleInListViewAttribute) && ((a as VisibleInListViewAttribute).Value as bool?) == true)).ToList();
+            visibleProperties.ForEach(x => list.Add(x.Name));
+            return list;
+        }
+
+        public static string TenderUrl { get; set; }
+
+        public static DateTime GetDateFromString(string value)
+        {
+            if (CheckDateDayFirst(value))
+            {
+                return new DateTime(Convert.ToInt32(value.Substring(6, 4)), Convert.ToInt32(value.Substring(3, 2)), Convert.ToInt32(value.Substring(0, 2)));
+            }
+            else if (CheckDateYearFirst(value))
+            {
+                return Convert.ToDateTime(value);
+            }
+            else return DateTime.MinValue;
+        }
+
+        public static bool CheckDateYearFirst(string value)
+        {
+            if(value.Length >= 10)
+            {
+                value = value.Substring(0, 10);
+            }
+            Regex reggie = new Regex(@"^\d{4}-((0[1-9])|(1[012]))-((0[1-9]|[12]\d)|3[01])$");
+            return reggie.IsMatch(value);
+        }
+
+        public static bool CheckDateDayFirst(string value)
+        {
+            if (value.Length >= 10)
+            {
+                value = value.Substring(0, 10);
+            }
+            Regex reggie = new Regex(@"^(?:(?:31(\/|-|\.)(?:0?[13578]|1[02]))\1|(?:(?:29|30)(\/|-|\.)(?:0?[13-9]|1[0-2])\2))(?:(?:1[6-9]|[2-9]\d)?\d{2})$|^(?:29(\/|-|\.)0?2\3(?:(?:(?:1[6-9]|[2-9]\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00))))$|^(?:0?[1-9]|1\d|2[0-8])(\/|-|\.)(?:(?:0?[1-9])|(?:1[0-2]))\4(?:(?:1[6-9]|[2-9]\d)?\d{2})$");
+            return reggie.IsMatch(value);
+        }
+
         public static bool IsValidEmail(string item)
         {
             if (!string.IsNullOrEmpty(item))

UnivateProperties_API/Model/Communication/PlaceHolder.cs

@@ -1,13 +1,9 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace UnivateProperties_API.Model.Communication
 {
     public class PlaceHolder : BaseEntity
     {
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Key]
-        public int Id { get; set; }
         public string Name { get; set; }
         public string BoundToClass { get; set; }
         public string BoundToClassDisplay { get; set; }

UnivateProperties_API/Model/Users/Person.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using UnivateProperties_API.Helpers.Attributes;
 
 namespace UnivateProperties_API.Model.Users
 {
@@ -17,13 +18,29 @@ namespace UnivateProperties_API.Model.Users
         public int? UserId { get; set; }
         public string Name { get; set; }
         public string Surname { get; set; }
+        [NotMapped]
+        [VisibleInListView]
+        public string FullName
+        {
+            get
+            {
+                return $"{Name} {Surname}";
+            }
+        }
+        [VisibleInListView(true)]
         [DataType(DataType.EmailAddress)]
         public string Email { get; set; }
+        [VisibleInListView(false)]
         [Phone]
         public string Telephone { get; set; }
         [Phone]
         public string CellNumber { get; set; }
         public virtual User User { get; set; }
         #endregion Properties
+
+        public override string ToString()
+        {
+            return $"{Name} {Surname}";
+        }
     }
 }

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -1,10 +1,16 @@
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
+using System.IO;
 using System.Linq;
+using System.Net;
+using System.Text;
 using UnivateProperties_API.Containers.Timeshare;
 using UnivateProperties_API.Containers.Users;
 using UnivateProperties_API.Context;
+using UnivateProperties_API.Helpers;
+using UnivateProperties_API.Model.Region;
 using UnivateProperties_API.Model.Timeshare;
 using UnivateProperties_API.Repository.Region;
 using UnivateProperties_API.Repository.Users;
@@ -40,10 +46,14 @@ namespace UnivateProperties_API.Repository.Timeshare
         public List<WeekDto> GetDtoListAll()
         {
             List<WeekDto> list = new List<WeekDto>();
-            foreach(var item in GetDetailedAll())
+            foreach (var item in GetDetailedAll())
             {
                 list.Add(new WeekDto(item));
             }
+            foreach (var  item in GetTenderWeeks())
+            {
+                list.Add(item);
+            }
             return list;
         }
 
@@ -52,14 +62,14 @@ namespace UnivateProperties_API.Repository.Timeshare
             List<WeekDto> list = new List<WeekDto>();
             UserRepository userRepository = new UserRepository(_dbContext);
             var user = userRepository.Get(x => x.Id == userId).FirstOrDefault();
-            if(user.IsUserInRole(Role.SuperAdmin))
+            if (user.IsUserInRole(Role.SuperAdmin))
             {
                 foreach (var item in GetDetailedAll())
                 {
                     list.Add(new WeekDto(item));
                 }
             }
-            else if(user.IsUserInRole(Role.Agency))
+            else if (user.IsUserInRole(Role.Agency))
             {
                 foreach (var item in GetDetailedAll().Where(x => x.AgencyId == userId))
                 {
@@ -102,10 +112,10 @@ namespace UnivateProperties_API.Repository.Timeshare
                 }
             }
             list = list.OrderBy(x => x.RegionName).ToList();
-            foreach(var region in list)
+            foreach (var region in list)
             {
                 region.OrderResorts();
-                foreach(var resort in region.Resorts)
+                foreach (var resort in region.Resorts)
                 {
                     resort.Available = allItems.Count(x => x.ResortCode == resort.ResortCode);
                 }
@@ -117,7 +127,7 @@ namespace UnivateProperties_API.Repository.Timeshare
         {
             var list = GetAll();
             List<TimeshareWeek> weeklist = new List<TimeshareWeek>();
-            foreach(var item in list)
+            foreach (var item in list)
             {
                 weeklist.Add(GetDetailedWeek(item));
             }
@@ -126,12 +136,12 @@ namespace UnivateProperties_API.Repository.Timeshare
 
         private TimeshareWeek GetDetailedWeek(TimeshareWeek week)
         {
-            if(week.AgencyId != null)
+            if (week.AgencyId != null)
             {
                 AgencyRepository agency = new AgencyRepository(_dbContext);
                 week.Agency = agency.Get(x => x.Id == week.AgencyId).FirstOrDefault();
             }
-            if(week.AgentId != null)
+            if (week.AgentId != null)
             {
                 AgentRepository agent = new AgentRepository(_dbContext);
                 week.Agent = agent.Get(x => x.Id == week.AgentId).FirstOrDefault();
@@ -170,7 +180,7 @@ namespace UnivateProperties_API.Repository.Timeshare
             // Set starting Status of A1
             StatusRepository repo = new StatusRepository(_dbContext);
             item.Status = repo.GetDetailed(s => s.Code == "A1");
-            if(item.Status != null)
+            if (item.Status != null)
             {
                 //Create initial
                 item.Status = new Status()
@@ -224,7 +234,7 @@ namespace UnivateProperties_API.Repository.Timeshare
 
         public void Save()
         {
-            _dbContext.SaveChanges();            
+            _dbContext.SaveChanges();
         }
 
         public void Update(TimeshareWeek item)
@@ -271,5 +281,59 @@ namespace UnivateProperties_API.Repository.Timeshare
             id += 1;
             return id;
         }
+
+        private List<WeekDto> GetTenderWeeks()
+        {
+            List<WeekDto> list = new List<WeekDto>();
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(MyCommon.TenderUrl);
+            request.Method = "GET";
+            WebResponse response = request.GetResponse();
+            using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
+            {
+                string result = reader.ReadToEnd();
+
+                if (result.Length > 0)
+                {
+                    string cleanLine;
+                    string[] lines = result.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                    foreach (string line in lines)
+                    {
+                        cleanLine = line.Replace("<br>", "");
+                        cleanLine = line.Replace("<br/>", "");
+                        list.Add(new WeekDto(cleanLine));
+                    }
+                }
+            }
+            // Check that all regions are same as other
+            list
+                .Where(x => x.Region != null && x.Region.RegionCode == "FN")
+                .ToList()
+                .ForEach(x => x.Region.RegionCode = ChangeRegion(x.Region.RegionCode));
+            list = GetRegion(list);
+            return list;
+        }
+
+        private List<WeekDto> GetRegion(List<WeekDto> list)
+        {
+            ProvinceRepository province = new ProvinceRepository(_dbContext);
+            Province prov = null;
+            foreach(var item in list)
+            {
+                prov = province.GetDetailed(x => x.Code == item.Region.RegionCode);
+                item.Region = new RegionDto(prov.Id, prov.Code, prov.Description);
+            }
+            return list;
+        }
+
+        private string ChangeRegion(string value)
+        {
+            switch(value)
+            {
+                case "FN":
+                    return "KZN";
+                default:
+                    return value;
+            }
+        }
     }
 }

UnivateProperties_API/Repository/Users/IndividualRepository.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnivateProperties_API.Context;
+using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Users;
 
 namespace UnivateProperties_API.Repository.Users
@@ -23,6 +24,10 @@ namespace UnivateProperties_API.Repository.Users
 
         public List<Individual> GetAll()
         {
+            foreach(var item in _dbContext.Individuals.Include("User").ToList())
+            {
+                var list = MyCommon.GetVisibleColumns(item);
+            }
             return _dbContext.Individuals.Include("User").ToList();
         }
 

UnivateProperties_API/Startup.cs

@@ -11,6 +11,7 @@ using Microsoft.IdentityModel.Tokens;
 using System.Text;
 using System.Threading.Tasks;
 using UnivateProperties_API.Context;
+using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Banks;
 using UnivateProperties_API.Model.Communication;
 using UnivateProperties_API.Model.ProcessFlow;
@@ -50,6 +51,7 @@ namespace UnivateProperties_API
             }));
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
             services.AddDbContext<DataContext>(o => o.UseNpgsql(Configuration.GetConnectionString("DefaultConnection")));
+            MyCommon.TenderUrl = Configuration.GetConnectionString("TenderConnection");
 
             var appSettingsSection = Configuration.GetSection("AppSettings");
             services.Configure<AppSettings>(appSettingsSection);

UnivateProperties_API/appsettings.json

@@ -9,6 +9,7 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultConnection": "Server=localhost;Port=5432;Database=Univate;User Id=postgres;Password=prov1s1on;"
+    "DefaultConnection": "Server=localhost;Port=5432;Database=Univate;User Id=postgres;Password=prov1s1on;",
+    "TenderConnection": "http://www.unipoint-consoft.co.za/nph-srep.exe?cluvavail_test.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N"
   }
 }