update unit controller and models

Author: sventhiel

Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Controllers/UnitController.cs

@@ -1,19 +1,21 @@
 using BExIS.App.Bootstrap.Attributes;
 using BExIS.Dlm.Entities.DataStructure;
+using BExIS.Dlm.Entities.Meanings;
 using BExIS.Dlm.Services.DataStructure;
+using BExIS.Dlm.Services.Meanings;
+using BExIS.Dlm.Services.MetadataStructure;
+using BExIS.Modules.Rpm.UI.Models;
 using BExIS.Modules.Rpm.UI.Models;
 using BExIS.Modules.Rpm.UI.Models.Dimensions;
 using BExIS.Modules.Rpm.UI.Models.Units;
+using BExIS.Security.Entities.Subjects;
+using BExIS.Security.Services.Subjects;
 using BExIS.UI.Helpers;
+using BExIS.Utils.NH.Querying;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using BExIS.Modules.Rpm.UI.Models;
-using BExIS.Dlm.Entities.Meanings;
-using BExIS.Dlm.Services.Meanings;
-using BExIS.Utils.NH.Querying;
 using System.Web.Mvc;
-using BExIS.Dlm.Services.MetadataStructure;
 
 namespace BExIS.Modules.Rpm.UI.Controllers
 {
@@ -35,7 +37,15 @@ public JsonResult GetUnits()
         {
             using (UnitManager unitManager = new UnitManager())
             {
-                return Json(convertToUnitListItem(unitManager.Repo.Get().OrderBy(u => u.Id).ToList()), JsonRequestBehavior.AllowGet);
+                var units = new List<UnitListItem>();
+
+                foreach (var unit in unitManager.Repo.Query())
+                {
+                    units.Add(UnitListItem.Convert(unit));
+                }
+
+                //return Json(unitManager.Repo.Get().OrderBy(u => u.Id).ToList(), JsonRequestBehavior.AllowGet);
+                return Json(units, JsonRequestBehavior.AllowGet);
             }
         }
 

Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Models/DataTypeModels.cs

@@ -1,4 +1,7 @@
-namespace BExIS.Modules.Rpm.UI.Models.DataTypes
+using BExIS.Dlm.Entities.DataStructure;
+using BExIS.Modules.Rpm.UI.Models.Dimensions;
+
+namespace BExIS.Modules.Rpm.UI.Models.DataTypes
 {
     public class DataTypeListItem
     {
@@ -32,5 +35,17 @@ public DataTypeListItem()
             SystemType = string.Empty;
             InUse = false;
         }
+
+        public static DataTypeListItem Convert(DataType dataType)
+        {
+            return new DataTypeListItem()
+            {
+                Id = dataType.Id,
+                Name = dataType.Name,
+                Description = dataType.Description,
+                SystemType = dataType.SystemType,
+                InUse = dataType.DataContainers.Count > 0
+            };
+        }
     }
 }

Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Models/DimensionModels.cs

@@ -1,4 +1,7 @@
-namespace BExIS.Modules.Rpm.UI.Models.Dimensions
+using BExIS.Dlm.Entities.DataStructure;
+using BExIS.Modules.Rpm.UI.Models.Units;
+
+namespace BExIS.Modules.Rpm.UI.Models.Dimensions
 {
     public class DimensionListItem
     {
@@ -32,5 +35,17 @@ public DimensionListItem()
             Specification = string.Empty;
             InUse = false;
         }
+
+        public static DimensionListItem Convert(Dimension dimension)
+        {
+            return new DimensionListItem()
+            {
+                Id = dimension.Id,
+                Name = dimension.Name,
+                Description = dimension.Description,
+                Specification = dimension.Specification,
+                InUse = dimension.Units.Count > 0
+            };
+        }
     }
 }

Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Models/UnitModels.cs

@@ -1,10 +1,13 @@
 
-using System.Collections.Generic;
+using BExIS.Dlm.Entities.DataStructure;
 using BExIS.Dlm.Entities.Meanings;
-using System.Runtime.Remoting.Activation;
 using BExIS.Modules.Rpm.UI.Models.Dimensions;
 using BExIS.Modules.Rpm.UI.Models.Dimensions;
+using BExIS.Security.Entities.Subjects;
+using System.Collections.Generic;
 using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Remoting.Activation;
 
 
 namespace BExIS.Modules.Rpm.UI.Models.Units
@@ -61,6 +64,22 @@ public UnitListItem()
             InUse = false;
             Link = new LinkItem();
         }
+
+        public static UnitListItem Convert(Unit unit)
+        {
+            return new UnitListItem()
+            {
+                Id = unit.Id,
+                Name = unit.Name,
+                Description = unit.Description,
+                Abbreviation = unit.Abbreviation,
+                Dimension = DimensionListItem.Convert(unit.Dimension),
+                Datatypes = unit.AssociatedDataTypes.Select(d => DataTypeListItem.Convert(d)).ToList(),
+                InUse = unit.DataContainers.Count > 0,
+                Link = new LinkItem(),
+                MeasurementSystem = unit.MeasurementSystem.ToString()
+            };
+        }
     }
 
     public class LinkItem
@@ -106,5 +125,16 @@ public DataTypeListItem()
             Description = string.Empty;
             SystemType = string.Empty;
         }
+
+        public static DataTypeListItem Convert(DataType dataType)
+        {
+            return new DataTypeListItem()
+            {
+                Id = dataType.Id,
+                Name = dataType.Name,
+                Description = dataType.Description,
+                SystemType = dataType.SystemType
+            };
+        }
     }
 }