Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivatePropertiesAPI

UnivateProperties_API/Containers/Property/GroupFields.cs

@@ -6,6 +6,7 @@
         public int ID { get; set; }
         public string Name { get; set; }
         public string Type { get; set; }
+        public string Value { get; set; }
         #endregion
     }
 }

UnivateProperties_API/Containers/Property/PropertyDetail.cs

@@ -8,4 +8,12 @@
         public string Description { get; set; }
         #endregion 
     }
+
+    public class PropertyEditDetails
+    {
+        #region Properties
+        public string PropertyType { get; set; }
+        public string SaleType { get; set; }
+        #endregion
+    }
 }

UnivateProperties_API/Controllers/Properties/PropertyController.cs

@@ -18,6 +18,7 @@ namespace UnivateProperties_API.Controllers.Properties
             _Repo = repo;
         }
 
+        #region Get Methods
         [HttpGet]
         public IActionResult Get()
         {
@@ -80,6 +81,13 @@ namespace UnivateProperties_API.Controllers.Properties
                 return new NoContentResult();
         }
 
+        [HttpGet("GetEditDisplay/{id}")]
+        public IActionResult GetEditDisplay(int id)
+        {
+            return new OkObjectResult(_Repo.GetEditDisplay(x => x.Id == id));
+        }
+        #endregion
+
         [HttpPost]
         public IActionResult Post([FromBody] Property property)
         {

UnivateProperties_API/Controllers/Properties/PropertyFieldsController.cs

@@ -31,6 +31,12 @@ namespace UnivateProperties_API.Controllers.Properties
         {
             return new OkObjectResult(_Repo.GetFieldListByPropType(type));
         }
+
+        [HttpGet("GetSavedValues/{propertyType}/{name}/{id}")]
+        public IActionResult GetSavedValues(string propertyType, string name, int id)
+        {
+            return new OkObjectResult(_Repo.GetFieldList(propertyType, name, id));
+        }
     }
 
 

UnivateProperties_API/Controllers/Properties/PropertyUserFieldController.cs

@@ -28,6 +28,12 @@ namespace UnivateProperties_API.Controllers.Properties
             return new OkObjectResult(_Repo.GetDetailed(x => x.Id == id));
         }
 
+        [HttpGet("PropertyFields/{id}")]
+        public IActionResult GetPropertyFields(int id)
+        {
+            return new OkObjectResult(_Repo.Get(x => x.PropertyId == id));
+        }
+
         [HttpPost]
         public IActionResult Post([FromBody] PropertyUserField propertyUserField)
         {

UnivateProperties_API/Repository/Properties/IPropertyRepository.cs

@@ -13,5 +13,6 @@ namespace UnivateProperties_API.Repository.Properties
         List<PropertyDisplay> GetDisplay(string type, string propertyType, string province, string city, string suburb, string propType);
         List<PropertyDisplay> GetLatestDisplay();
         List<PropertyType> GetPropertyTypes(Func<PropertyType, bool> where);
+        PropertyEditDetails GetEditDisplay(Func<Property, bool> where);
     }
 }

UnivateProperties_API/Repository/Properties/IUserDefinedGroupRepository.cs

@@ -8,6 +8,8 @@ namespace UnivateProperties_API.Repository.Properties
     {
         List<Group> GetFieldList(string name);
 
+        List<Group> GetFieldList(string propertyType, string name, int propertyID);
+
         List<Group> GetFieldListByPropType(string propertyType);
     }
 }

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -358,5 +358,19 @@ namespace UnivateProperties_API.Repository.Properties
             List<Property> props = GetAll().OrderBy(x => x.Created).Take(3).ToList();
             return GetDisplayDetails(props);
         }
+
+        public PropertyEditDetails GetEditDisplay(Func<Property, bool> where)
+        {
+            var property = dBContext.Properties.Include("PropertyType").Where(where).FirstOrDefault();
+            PropertyEditDetails details = new PropertyEditDetails();
+
+            if (property != null)
+            {
+                details.SaleType = property.IsSale ? "Sale" : "Rental";
+                details.PropertyType = property.PropertyType.UsageType.ToString();
+            }
+
+            return details;
+        }
     }
 }

UnivateProperties_API/Repository/Properties/UserDefinedFieldRepository.cs

@@ -18,12 +18,12 @@ namespace UnivateProperties_API.Repository.Properties
 
         public List<UserDefinedField> Get(Func<UserDefinedField, bool> where)
         {
-            return dBContext.UserDefinedFields.Where(where).ToList();
+            return dBContext.UserDefinedFields.Where(where).OrderBy(x => x.Rank).ToList();
         }
 
         public List<UserDefinedField> GetAll()
         {
-            return dBContext.UserDefinedFields.ToList();
+            return dBContext.UserDefinedFields.OrderBy(x => x.Rank).ToList();
         }
 
         public UserDefinedField GetDetailed(Func<UserDefinedField, bool> first)

UnivateProperties_API/Repository/Properties/UserDefinedGroupRepository.cs

@@ -19,12 +19,12 @@ namespace UnivateProperties_API.Repository.Properties
 
         public List<UserDefinedGroup> Get(Func<UserDefinedGroup, bool> where)
         {
-            return dBContext.UserDefinedGroups.Where(where).ToList();
+            return dBContext.UserDefinedGroups.Where(where).OrderBy(x => x.Rank).ToList();
         }
 
         public List<UserDefinedGroup> GetAll()
         {
-            return dBContext.UserDefinedGroups.ToList();
+            return dBContext.UserDefinedGroups.OrderBy(x => x.Rank).ToList();
         }
 
         public UserDefinedGroup GetDetailed(Func<UserDefinedGroup, bool> first)
@@ -75,6 +75,28 @@ namespace UnivateProperties_API.Repository.Properties
             return FieldGroups;
         }
 
+        public List<Group> GetFieldList(string propertyType, string name, int propertyID)
+        {
+            List<Group> FieldGroups = GetFieldList(name);
+            if (name == "Property Overview")
+                FieldGroups = GetFieldList(name);
+            else
+                FieldGroups = GetFieldListByPropType(propertyType);
+
+            var savedValues = dBContext.PropertyUserFields.Where(x => x.PropertyId == propertyID).ToList();
+            foreach (Group group in FieldGroups)
+            {
+                foreach(GroupFields field in group.Fields)
+                {
+                    var item = savedValues.Find(x => x.UserDefinedFieldId == field.ID);
+                    if (item != null)
+                        field.Value = item.Value;
+                }
+            }
+
+            return FieldGroups;
+        }
+
         public List<Group> GetFieldListByPropType(string propertyType)
         {
             List<Group> FieldGroups = new List<Group>();